diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 2d2fbbc55ef25b5962cc475f235623f2360df4eb..e99c9d20b2130e8a041d547a9d82182f38190a63 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -636,7 +636,7 @@ def RecreateDisks(opts, args):
   else:
     opts.disks = []
 
-  op = opcodes.OpRecreateInstanceDisks(instance_name=instance_name,
+  op = opcodes.OpInstanceRecreateDisks(instance_name=instance_name,
                                        disks=opts.disks)
   SubmitOrSend(op, opts)
   return 0
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 9d22779b00f36999fe0f64e1a679ad792f555a7f..a38735074d94888913c7d7d0508b7b3e0339863d 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5272,7 +5272,7 @@ class LUReinstallInstance(LogicalUnit):
       _ShutdownInstanceDisks(self, inst)
 
 
-class LURecreateInstanceDisks(LogicalUnit):
+class LUInstanceRecreateDisks(LogicalUnit):
   """Recreate an instance's missing disks.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 2239f8157b739a1f81cb72f3fdf1593ce1f8cc56..0f8827de3bebd3de52cce997ecf037f23b80a9b5 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -953,7 +953,7 @@ class OpInstanceDeactivateDisks(OpCode):
     ]
 
 
-class OpRecreateInstanceDisks(OpCode):
+class OpInstanceRecreateDisks(OpCode):
   """Deactivate an instance's disks."""
   OP_ID = "OP_INSTANCE_RECREATE_DISKS"
   OP_DSC_FIELD = "instance_name"