diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 2b8964b0bbd7375efd2c45bc3236f8e51444896a..23a2e64cb82dfa233226aa79cd4759985490aaf9 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -679,7 +679,7 @@ def _StartupInstance(name, opts):
   @return: the opcode needed for the operation
 
   """
-  op = opcodes.OpStartupInstance(instance_name=name,
+  op = opcodes.OpInstanceStartup(instance_name=name,
                                  force=opts.force,
                                  ignore_offline_nodes=opts.ignore_offline)
   # do not add these parameters to the opcode unless they're defined
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 6770eda1fbceab449faa5bae0ed7deada469b3d3..8e3b33b85a571555818823039436e48f041597e7 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4948,7 +4948,7 @@ def _CheckNodesFreeDiskOnVG(lu, nodenames, vg, requested):
                                  errors.ECODE_NORES)
 
 
-class LUStartupInstance(LogicalUnit):
+class LUInstanceStartup(LogicalUnit):
   """Starts an instance.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 198f3616d652977677045aa767c42ff14b0eefe3..3696845a76733e51823f4b57193fc2a3ca8727b3 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -825,7 +825,7 @@ class OpInstanceRename(OpCode):
     ]
 
 
-class OpStartupInstance(OpCode):
+class OpInstanceStartup(OpCode):
   """Startup an instance."""
   OP_ID = "OP_INSTANCE_STARTUP"
   OP_DSC_FIELD = "instance_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 098da38313951204406db4a0de13b3143105ee7b..6b7bb93bf95a2b38f0f6f6978cfd78690d0cbd59 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -995,7 +995,7 @@ class R_2_instances_name_startup(baserlib.R_Generic):
     """
     instance_name = self.items[0]
     force_startup = bool(self._checkIntVariable('force'))
-    op = opcodes.OpStartupInstance(instance_name=instance_name,
+    op = opcodes.OpInstanceStartup(instance_name=instance_name,
                                    force=force_startup,
                                    dry_run=bool(self.dryRun()))
 
@@ -1038,7 +1038,7 @@ def _ParseInstanceReinstallRequest(name, data):
     ]
 
   if start:
-    ops.append(opcodes.OpStartupInstance(instance_name=name, force=False))
+    ops.append(opcodes.OpInstanceStartup(instance_name=name, force=False))
 
   return ops
 
diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index 21ccba9a11d54ef8b983bd76ebced2f031f5949f..ca896ae165f046761d7da4b1b750bcf90073a0ea 100644
--- a/lib/watcher/__init__.py
+++ b/lib/watcher/__init__.py
@@ -399,7 +399,7 @@ class Instance(object):
     """Encapsulates the start of an instance.
 
     """
-    op = opcodes.OpStartupInstance(instance_name=self.name, force=False)
+    op = opcodes.OpInstanceStartup(instance_name=self.name, force=False)
     cli.SubmitOpCode(op, cl=client)
 
   def ActivateDisks(self):
diff --git a/test/ganeti.rapi.rlib2_unittest.py b/test/ganeti.rapi.rlib2_unittest.py
index fc0158cae9ea912eaebe72d02fa0409e4336c81b..c2f73796fd56c8f494f7e678ea9276cb5b837099 100755
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -368,7 +368,7 @@ class TestParseInstanceReinstallRequest(testutils.GanetiTestCase):
     expcls = [
       opcodes.OpInstanceShutdown,
       opcodes.OpInstanceReinstall,
-      opcodes.OpStartupInstance,
+      opcodes.OpInstanceStartup,
       ]
 
     self.assert_(compat.all(isinstance(op, exp)
diff --git a/tools/burnin b/tools/burnin
index 1c493ed1f2e23c6eb5014ff911200c7243114793..7b2c4b7a43e7f465cedf202e0fb94ba11961fff0 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -757,7 +757,7 @@ class Burner(object):
   @staticmethod
   def StartInstanceOp(instance):
     """Start given instance."""
-    return opcodes.OpStartupInstance(instance_name=instance, force=False)
+    return opcodes.OpInstanceStartup(instance_name=instance, force=False)
 
   @staticmethod
   def RenameInstanceOp(instance, instance_new):