diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py
index e2ede0abd7b35da8f49e6771de924e967bb0b096..8910f342325379dfa09aa9aea03692423f630132 100644
--- a/lib/client/gnt_node.py
+++ b/lib/client/gnt_node.py
@@ -633,7 +633,7 @@ def ModifyStorage(opts, args):
     changes[constants.SF_ALLOCATABLE] = opts.allocatable
 
   if changes:
-    op = opcodes.OpModifyNodeStorage(node_name=node_name,
+    op = opcodes.OpNodeModifyStorage(node_name=node_name,
                                      storage_type=storage_type,
                                      name=volume_name,
                                      changes=changes)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 75fb71235805859bb134451ea24f0dc9a022fdf8..d5c4252c0c18ab70d8f663397a0b89233c9a9935 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3887,7 +3887,7 @@ class LUQueryFields(NoHooksLU):
     return self.qcls.FieldsQuery(self.op.fields)
 
 
-class LUModifyNodeStorage(NoHooksLU):
+class LUNodeModifyStorage(NoHooksLU):
   """Logical unit for modifying a storage volume on a node.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 7a2356b190946f8131b463739d2f30ee8a6c9bb2..32731dbd74209eb313183850e58d10e5ffe435fc 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -668,7 +668,7 @@ class OpQueryNodeStorage(OpCode):
     ]
 
 
-class OpModifyNodeStorage(OpCode):
+class OpNodeModifyStorage(OpCode):
   """Modifies the properies of a storage unit"""
   OP_ID = "OP_NODE_MODIFY_STORAGE"
   OP_PARAMS = [
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 0e52d3076296ca1a5b79ba5bc04ff1b3606bb0c3..a267c9aef2f0c1181ee1d9d5016d754fee1d1c7b 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -518,7 +518,7 @@ class R_2_nodes_name_storage_modify(baserlib.R_Generic):
       changes[constants.SF_ALLOCATABLE] = \
         bool(self._checkIntVariable("allocatable", default=1))
 
-    op = opcodes.OpModifyNodeStorage(node_name=node_name,
+    op = opcodes.OpNodeModifyStorage(node_name=node_name,
                                      storage_type=storage_type,
                                      name=name,
                                      changes=changes)