diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py
index 42256d8f6e1fd03a91b2a05105fa89961b9cfa0b..e2ede0abd7b35da8f49e6771de924e967bb0b096 100644
--- a/lib/client/gnt_node.py
+++ b/lib/client/gnt_node.py
@@ -369,7 +369,7 @@ def MigrateNode(opts, args):
     mode = constants.HT_MIGRATION_NONLIVE
   else:
     mode = opts.migration_mode
-  op = opcodes.OpMigrateNode(node_name=args[0], mode=mode)
+  op = opcodes.OpNodeMigrate(node_name=args[0], mode=mode)
   SubmitOpCode(op, cl=cl, opts=opts)
 
 
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index a1507cfe7e871817bdc13ca19c6427a60acbb561..75fb71235805859bb134451ea24f0dc9a022fdf8 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5912,7 +5912,7 @@ class LUInstanceMove(LogicalUnit):
                                  (instance.name, target_node, msg))
 
 
-class LUMigrateNode(LogicalUnit):
+class LUNodeMigrate(LogicalUnit):
   """Migrate all instances from a node.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 7fbb443e97413847d7b5ed11656e2295778a4688..7a2356b190946f8131b463739d2f30ee8a6c9bb2 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -720,7 +720,7 @@ class OpPowercycleNode(OpCode):
     ]
 
 
-class OpMigrateNode(OpCode):
+class OpNodeMigrate(OpCode):
   """Migrate all instances from a node."""
   OP_ID = "OP_NODE_MIGRATE"
   OP_DSC_FIELD = "node_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 5dba35d04ca3ca1d1b554112b59220d3c7f4e6c3..0e52d3076296ca1a5b79ba5bc04ff1b3606bb0c3 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -464,7 +464,7 @@ class R_2_nodes_name_migrate(baserlib.R_Generic):
     else:
       mode = self._checkStringVariable("mode", default=None)
 
-    op = opcodes.OpMigrateNode(node_name=node_name, mode=mode)
+    op = opcodes.OpNodeMigrate(node_name=node_name, mode=mode)
 
     return baserlib.SubmitJob([op])