diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 0e38e64b4b90ac497847d086591d8a20e6da3794..7f16cc4cd7ad52954cea61ab842ff9f9aa49e1b0 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -843,7 +843,7 @@ def MigrateInstance(opts, args):
   else:
     mode = opts.migration_mode
 
-  op = opcodes.OpMigrateInstance(instance_name=instance_name, mode=mode,
+  op = opcodes.OpInstanceMigrate(instance_name=instance_name, mode=mode,
                                  cleanup=opts.cleanup)
   SubmitOpCode(op, cl=cl, opts=opts)
   return 0
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 2cb3374fc4bc6106aab79579d30ef0c6cbf4a0ce..dc2e6e4dca209211ac4a5a4f05d30e511ef96ed6 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5688,7 +5688,7 @@ class LUInstanceFailover(LogicalUnit):
                                  (instance.name, target_node, msg))
 
 
-class LUMigrateInstance(LogicalUnit):
+class LUInstanceMigrate(LogicalUnit):
   """Migrate an instance.
 
   This is migration without shutting down, compared to the failover,
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 1a1c01f57c2d49cb1a321e4af6e561164e412793..3052b203efd738343d14a95655318d840814881b 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -886,7 +886,7 @@ class OpInstanceFailover(OpCode):
     ]
 
 
-class OpMigrateInstance(OpCode):
+class OpInstanceMigrate(OpCode):
   """Migrate an instance.
 
   This migrates (without shutting down an instance) to its secondary
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 26c31f42e6d84c9c4003eb542645c76e90140c36..a2f2782087075ec2c1505500719092b8060bc1dc 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -1207,7 +1207,7 @@ class R_2_instances_name_export(baserlib.R_Generic):
 def _ParseMigrateInstanceRequest(name, data):
   """Parses a request for an instance migration.
 
-  @rtype: L{opcodes.OpMigrateInstance}
+  @rtype: L{opcodes.OpInstanceMigrate}
   @return: Instance migration opcode
 
   """
@@ -1215,7 +1215,7 @@ def _ParseMigrateInstanceRequest(name, data):
   cleanup = baserlib.CheckParameter(data, "cleanup", exptype=bool,
                                     default=False)
 
-  return opcodes.OpMigrateInstance(instance_name=name, mode=mode,
+  return opcodes.OpInstanceMigrate(instance_name=name, mode=mode,
                                    cleanup=cleanup)
 
 
diff --git a/test/ganeti.rapi.rlib2_unittest.py b/test/ganeti.rapi.rlib2_unittest.py
index f7d51d8ac5ab437618599b0f857672cfa7775775..2c3d9e46c24cd6a98e4e2b3f10e49a2eea9040d7 100755
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -239,7 +239,7 @@ class TestParseMigrateInstanceRequest(testutils.GanetiTestCase):
           "mode": mode,
           }
         op = self.Parse(name, data)
-        self.assert_(isinstance(op, opcodes.OpMigrateInstance))
+        self.assert_(isinstance(op, opcodes.OpInstanceMigrate))
         self.assertEqual(op.instance_name, name)
         self.assertEqual(op.mode, mode)
         self.assertEqual(op.cleanup, cleanup)
@@ -248,7 +248,7 @@ class TestParseMigrateInstanceRequest(testutils.GanetiTestCase):
     name = "instnohZeex0"
 
     op = self.Parse(name, {})
-    self.assert_(isinstance(op, opcodes.OpMigrateInstance))
+    self.assert_(isinstance(op, opcodes.OpInstanceMigrate))
     self.assertEqual(op.instance_name, name)
     self.assertEqual(op.mode, None)
     self.assertFalse(op.cleanup)
diff --git a/tools/burnin b/tools/burnin
index 60f758d49e9deb7149efae636ecfde4f75890cdc..a5c31ab3303bce543ab04f2b8bbba5fb26dc8f04 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -671,10 +671,10 @@ class Burner(object):
     Log("Migrating instances")
     for instance in self.instances:
       Log("instance %s", instance, indent=1)
-      op1 = opcodes.OpMigrateInstance(instance_name=instance, mode=None,
+      op1 = opcodes.OpInstanceMigrate(instance_name=instance, mode=None,
                                       cleanup=False)
 
-      op2 = opcodes.OpMigrateInstance(instance_name=instance, mode=None,
+      op2 = opcodes.OpInstanceMigrate(instance_name=instance, mode=None,
                                       cleanup=True)
       Log("migration and migration cleanup", indent=2)
       self.ExecOrQueue(instance, [op1, op2])