diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 9c97aac0405e3585957abbf4d02f85e6f358b445..2d2fbbc55ef25b5962cc475f235623f2360df4eb 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -701,7 +701,7 @@ def _RebootInstance(name, opts):
   @return: the opcode needed for the operation
 
   """
-  return opcodes.OpRebootInstance(instance_name=name,
+  return opcodes.OpInstanceReboot(instance_name=name,
                                   reboot_type=opts.reboot_type,
                                   ignore_secondaries=opts.ignore_secondaries,
                                   shutdown_timeout=opts.shutdown_timeout)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index d6a9254c56b36ed20c16b937709c54ba1e68f37d..9d22779b00f36999fe0f64e1a679ad792f555a7f 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5049,7 +5049,7 @@ class LUStartupInstance(LogicalUnit):
         raise errors.OpExecError("Could not start instance: %s" % msg)
 
 
-class LURebootInstance(LogicalUnit):
+class LUInstanceReboot(LogicalUnit):
   """Reboot an instance.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 7a0dd7c6c79dc980e266cc77ef3b7900cd3c53c6..2239f8157b739a1f81cb72f3fdf1593ce1f8cc56 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -849,7 +849,7 @@ class OpShutdownInstance(OpCode):
     ]
 
 
-class OpRebootInstance(OpCode):
+class OpInstanceReboot(OpCode):
   """Reboot an instance."""
   OP_ID = "OP_INSTANCE_REBOOT"
   OP_DSC_FIELD = "instance_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 98dc70f02305ee998e39c53c054c0e4550c8b983..f06cbc87e6ed1f542191675f45b440531377cc12 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -972,7 +972,7 @@ class R_2_instances_name_reboot(baserlib.R_Generic):
     reboot_type = self.queryargs.get('type',
                                      [constants.INSTANCE_REBOOT_HARD])[0]
     ignore_secondaries = bool(self._checkIntVariable('ignore_secondaries'))
-    op = opcodes.OpRebootInstance(instance_name=instance_name,
+    op = opcodes.OpInstanceReboot(instance_name=instance_name,
                                   reboot_type=reboot_type,
                                   ignore_secondaries=ignore_secondaries,
                                   dry_run=bool(self.dryRun()))
diff --git a/tools/burnin b/tools/burnin
index 4afef8d90974ded3eb762acab8dd41601b040bf7..611a7b95313d44fb50af113e9b4e6b3d662fee76 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -832,7 +832,7 @@ class Burner(object):
       Log("instance %s", instance, indent=1)
       ops = []
       for reboot_type in self.opts.reboot_types:
-        op = opcodes.OpRebootInstance(instance_name=instance,
+        op = opcodes.OpInstanceReboot(instance_name=instance,
                                       reboot_type=reboot_type,
                                       ignore_secondaries=False)
         Log("reboot with type '%s'", reboot_type, indent=2)