diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 7a5ab7a5daea33e553bf7e813efa7ebb55ceba48..28c6edaadc130afb9040cda3670a4461b6808d2d 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -838,7 +838,7 @@ class NodeHttpServer(http.server.HttpServer):
   # Crypto
 
   @staticmethod
-  def perspective_create_x509_certificate(params):
+  def perspective_x509_cert_create(params):
     """Creates a new X509 certificate for SSL/TLS.
 
     """
@@ -846,7 +846,7 @@ class NodeHttpServer(http.server.HttpServer):
     return backend.CreateX509Certificate(validity)
 
   @staticmethod
-  def perspective_remove_x509_certificate(params):
+  def perspective_x509_cert_remove(params):
     """Removes a X509 certificate.
 
     """
@@ -856,7 +856,7 @@ class NodeHttpServer(http.server.HttpServer):
   # Import and export
 
   @staticmethod
-  def perspective_start_import_listener(params):
+  def perspective_import_start(params):
     """Starts an import daemon.
 
     """
@@ -869,7 +869,7 @@ class NodeHttpServer(http.server.HttpServer):
                                            _DecodeImportExportIO(dest,
                                                                  dest_args))
   @staticmethod
-  def perspective_start_export(params):
+  def perspective_export_start(params):
     """Starts an export daemon.
 
     """
@@ -884,14 +884,14 @@ class NodeHttpServer(http.server.HttpServer):
                                                                  source_args))
 
   @staticmethod
-  def perspective_get_import_export_status(params):
+  def perspective_impexp_status(params):
     """Retrieves the status of an import or export daemon.
 
     """
     return backend.GetImportExportStatus(params[0])
 
   @staticmethod
-  def perspective_cleanup_import_export(params):
+  def perspective_impexp_cleanup(params):
     """Cleans up after an import or export.
 
     """
diff --git a/lib/rpc.py b/lib/rpc.py
index b99b49e48568c92ef58cfa612af306c68a67266f..23df3ec3f6762fa615160afc88b9a691137dee74 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -1225,8 +1225,8 @@ class RpcRunner(object):
     """
     return self._SingleNodeCall(node, "remove_x509_certificate", [name])
 
-  def call_start_import_listener(self, node, x509_key_name, source_x509_ca,
-                                 instance, dest, dest_args):
+  def call_import_start(self, node, x509_key_name, source_x509_ca,
+                        instance, dest, dest_args):
     """Starts a listener for an import.
 
     This is a single-node call.
@@ -1237,12 +1237,12 @@ class RpcRunner(object):
     @param instance: Instance object
 
     """
-    return self._SingleNodeCall(node, "start_import_listener",
+    return self._SingleNodeCall(node, "import_start",
                                 [x509_key_name, source_x509_ca,
                                  self._InstDict(instance), dest,
                                  _EncodeImportExportIO(dest, dest_args)])
 
-  def call_start_export(self, node, x509_key_name, dest_x509_ca, host, port,
+  def call_export_start(self, node, x509_key_name, dest_x509_ca, host, port,
                         instance, source, source_args):
     """Starts an export daemon.
 
@@ -1254,12 +1254,12 @@ class RpcRunner(object):
     @param instance: Instance object
 
     """
-    return self._SingleNodeCall(node, "start_export",
+    return self._SingleNodeCall(node, "export_start",
                                 [x509_key_name, dest_x509_ca, host, port,
                                  self._InstDict(instance), source,
                                  _EncodeImportExportIO(source, source_args)])
 
-  def call_get_import_export_status(self, node, names):
+  def call_impexp_status(self, node, names):
     """Gets the status of an import or export.
 
     This is a single-node call.
@@ -1273,7 +1273,7 @@ class RpcRunner(object):
              a status couldn't be retrieved
 
     """
-    result = self._SingleNodeCall(node, "get_import_export_status", [names])
+    result = self._SingleNodeCall(node, "impexp_status", [names])
 
     if not result.fail_msg:
       decoded = []
@@ -1288,7 +1288,7 @@ class RpcRunner(object):
 
     return result
 
-  def call_cleanup_import_export(self, node, name):
+  def call_impexp_cleanup(self, node, name):
     """Cleans up after an import or export.
 
     This is a single-node call.
@@ -1299,4 +1299,4 @@ class RpcRunner(object):
     @param name: Import/export name
 
     """
-    return self._SingleNodeCall(node, "cleanup_import_export", [name])
+    return self._SingleNodeCall(node, "impexp_cleanup", [name])