diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 3ab78b4168eeea009f209961998cb1923e88a416..ec6b5ea6f390a716189dd5d0de5a2c2434baba8e 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -561,7 +561,7 @@ def RenameInstance(opts, args):
                    " that '%s' is a FQDN. Continue?" % args[1]):
       return 1
 
-  op = opcodes.OpRenameInstance(instance_name=args[0],
+  op = opcodes.OpInstanceRename(instance_name=args[0],
                                 new_name=args[1],
                                 ip_check=opts.ip_check,
                                 name_check=opts.name_check)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 88e7b6a8fb7c82b3019d2fb9863fc4ae399890af..38729e63765255a2630c387be9e53418622bbf94 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5332,7 +5332,7 @@ class LUInstanceRecreateDisks(LogicalUnit):
     _CreateDisks(self, self.instance, to_skip=to_skip)
 
 
-class LURenameInstance(LogicalUnit):
+class LUInstanceRename(LogicalUnit):
   """Rename an instance.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index fb760609b52a01332c9cdc85028a63f9f1072be8..f97a66acbaf396bf09f543d4aabbd512858a5007 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -814,7 +814,7 @@ class OpInstanceRemove(OpCode):
     ]
 
 
-class OpRenameInstance(OpCode):
+class OpInstanceRename(OpCode):
   """Rename an instance."""
   OP_ID = "OP_INSTANCE_RENAME"
   OP_PARAMS = [
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 7e8edf282cddc29a8b12fb8f324e86568ca9e095..cfbbc86c78712a98a107f14884a953c3f414db9f 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -1239,7 +1239,7 @@ class R_2_instances_name_migrate(baserlib.R_Generic):
 def _ParseRenameInstanceRequest(name, data):
   """Parses a request for renaming an instance.
 
-  @rtype: L{opcodes.OpRenameInstance}
+  @rtype: L{opcodes.OpInstanceRename}
   @return: Instance rename opcode
 
   """
@@ -1247,7 +1247,7 @@ def _ParseRenameInstanceRequest(name, data):
   ip_check = baserlib.CheckParameter(data, "ip_check", default=True)
   name_check = baserlib.CheckParameter(data, "name_check", default=True)
 
-  return opcodes.OpRenameInstance(instance_name=name, new_name=new_name,
+  return opcodes.OpInstanceRename(instance_name=name, new_name=new_name,
                                   name_check=name_check, ip_check=ip_check)
 
 
diff --git a/test/ganeti.rapi.rlib2_unittest.py b/test/ganeti.rapi.rlib2_unittest.py
index ece7b03a8c414a492f67a08e79d356a6df5ddcc5..24ff85177786d059ed1dbe23bac62fccfd5e0176 100755
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -273,7 +273,7 @@ class TestParseRenameInstanceRequest(testutils.GanetiTestCase):
             }
 
           op = self.Parse(name, data)
-          self.assert_(isinstance(op, opcodes.OpRenameInstance))
+          self.assert_(isinstance(op, opcodes.OpInstanceRename))
           self.assertEqual(op.instance_name, name)
           self.assertEqual(op.new_name, new_name)
           self.assertEqual(op.ip_check, ip_check)
@@ -288,7 +288,7 @@ class TestParseRenameInstanceRequest(testutils.GanetiTestCase):
         }
 
       op = self.Parse(name, data)
-      self.assert_(isinstance(op, opcodes.OpRenameInstance))
+      self.assert_(isinstance(op, opcodes.OpInstanceRename))
       self.assertEqual(op.instance_name, name)
       self.assertEqual(op.new_name, new_name)
       self.assert_(op.ip_check)
diff --git a/tools/burnin b/tools/burnin
index 7722c027914d4b7a50f472af4b19c15b6f7992bf..2f9aab703271d951d328aafc7bea992493b4968b 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -761,7 +761,7 @@ class Burner(object):
   @staticmethod
   def RenameInstanceOp(instance, instance_new):
     """Rename instance."""
-    return opcodes.OpRenameInstance(instance_name=instance,
+    return opcodes.OpInstanceRename(instance_name=instance,
                                     new_name=instance_new)
 
   @_DoCheckInstances