diff --git a/lib/rapi/client.py b/lib/rapi/client.py
index 53f26dedd13317dccc6ff33fe4b735a689672445..213712dddc7640591e00c3ac1c5abba66211c19a 100644
--- a/lib/rapi/client.py
+++ b/lib/rapi/client.py
@@ -1455,20 +1455,20 @@ class GanetiRapiClient(object): # pylint: disable=R0904
                              ("/%s/nodes/%s/role" %
                               (GANETI_RAPI_VERSION, node)), query, role)
 
-  def ModifyNode(self, group, **kwargs):
+  def ModifyNode(self, node, **kwargs):
     """Modifies a node.
 
     More details for parameters can be found in the RAPI documentation.
 
-    @type group: string
-    @param group: Node name
+    @type node: string
+    @param node: Node name
     @rtype: string
     @return: job id
 
     """
     return self._SendRequest(HTTP_POST,
                              ("/%s/nodes/%s/modify" %
-                              (GANETI_RAPI_VERSION, group)), None, kwargs)
+                              (GANETI_RAPI_VERSION, node)), None, kwargs)
 
   def GetNodeStorageUnits(self, node, storage_type, output_fields):
     """Gets the storage units for a node.
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index fbd1bd75557dd9f0b4f19c14a2f6dd54e3497473..74fdf228c5ffbfb7e014505b5b96219b13e679ef 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -513,7 +513,7 @@ class R_2_nodes_name_modify(baserlib.R_Generic):
     baserlib.CheckType(self.request_body, dict, "Body contents")
 
     op = baserlib.FillOpcode(opcodes.OpNodeSetParams, self.request_body, {
-      "instance_name": self.items[0],
+      "node_name": self.items[0],
       })
 
     return baserlib.SubmitJob([op])