diff --git a/doc/design-2.3.rst b/doc/design-2.3.rst
index 3fc3b2c960b5e0e57d6b988aac28b0ed6fe62feb..abd8c30634e974fae0a0accebb45a12cf8128563 100644
--- a/doc/design-2.3.rst
+++ b/doc/design-2.3.rst
@@ -292,7 +292,7 @@ instances they lock. If an LU uses the BGL, then it will invalidate the
 entire cache. In time, it is expected that LUs will be modified to not
 invalidate, if they are not expected to change the node's and/or
 instance's state (e.g. ``LUConnectConsole``, or
-``LUActivateInstanceDisks``).
+``LUInstanceActivateDisks``).
 
 Invalidation of a node's properties will also invalidate the capacity
 data associated with that node.
diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index 39c1a4e0e026bb1fef8630371aa3d5323270a1ff..90c4a5123f8b8e63ca043bb99081514fe3198407 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -477,7 +477,7 @@ def VerifyDisks(opts, args):
     for iname in instances:
       if iname in missing:
         continue
-      op = opcodes.OpActivateInstanceDisks(instance_name=iname)
+      op = opcodes.OpInstanceActivateDisks(instance_name=iname)
       try:
         ToStdout("Activating disks for instance '%s'", iname)
         SubmitOpCode(op, opts=opts, cl=cl)
diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index bb2079f3d80f03482774f2cc53252e0fbb830eba..0029a53e409708380f46ea09a4bdd2ff7e2f7294 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -589,7 +589,7 @@ def ActivateDisks(opts, args):
 
   """
   instance_name = args[0]
-  op = opcodes.OpActivateInstanceDisks(instance_name=instance_name,
+  op = opcodes.OpInstanceActivateDisks(instance_name=instance_name,
                                        ignore_size=opts.ignore_size)
   disks_info = SubmitOrSend(op, opts)
   for host, iname, nname in disks_info:
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index e4591a29f1fbffdee37a4720341698894b10c9dd..c0cf439c3d92dd8b4e58b9c38a35c229c62e4fa0 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4621,7 +4621,7 @@ class LUClusterConfigQuery(NoHooksLU):
     return values
 
 
-class LUActivateInstanceDisks(NoHooksLU):
+class LUInstanceActivateDisks(NoHooksLU):
   """Bring up an instance's disks.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index e1c38a518f19c2b94e03e029a9e9f66699e91cfc..b221f582be66a5cb8a51c78d5dc37dd4b91ffed7 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -934,7 +934,7 @@ class OpConnectConsole(OpCode):
     ]
 
 
-class OpActivateInstanceDisks(OpCode):
+class OpInstanceActivateDisks(OpCode):
   """Activate an instance's disks."""
   OP_ID = "OP_INSTANCE_ACTIVATE_DISKS"
   OP_DSC_FIELD = "instance_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 5b2f81847d95321e21d84fa85fab0ea462d52ad1..58da35b63353e6e09d9424e2d4ad3a06e21380d8 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -1120,7 +1120,7 @@ class R_2_instances_name_activate_disks(baserlib.R_Generic):
     instance_name = self.items[0]
     ignore_size = bool(self._checkIntVariable('ignore_size'))
 
-    op = opcodes.OpActivateInstanceDisks(instance_name=instance_name,
+    op = opcodes.OpInstanceActivateDisks(instance_name=instance_name,
                                          ignore_size=ignore_size)
 
     return baserlib.SubmitJob([op])
diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index 6a01ef321dcc9ccbd0b4d2413a8ab256e89f9f48..1d873d6e6953d1a22490a5c9c3b1aaf3601d93f4 100644
--- a/lib/watcher/__init__.py
+++ b/lib/watcher/__init__.py
@@ -406,7 +406,7 @@ class Instance(object):
     """Encapsulates the activation of all disks of an instance.
 
     """
-    op = opcodes.OpActivateInstanceDisks(instance_name=self.name)
+    op = opcodes.OpInstanceActivateDisks(instance_name=self.name)
     cli.SubmitOpCode(op, cl=client)
 
 
@@ -595,7 +595,7 @@ class Watcher(object):
                   utils.CommaJoin(offline_disk_instances))
     # we submit only one job, and wait for it. not optimal, but spams
     # less the job queue
-    job = [opcodes.OpActivateInstanceDisks(instance_name=name)
+    job = [opcodes.OpInstanceActivateDisks(instance_name=name)
            for name in offline_disk_instances]
     job_id = cli.SendJob(job, cl=client)
 
diff --git a/tools/burnin b/tools/burnin
index 5921dc457f6caf5cb620c4de6aedc5341d7cce7d..3adbe8396d07800af1fb130e5c32f0ab45cd2ba3 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -847,7 +847,7 @@ class Burner(object):
     for instance in self.instances:
       Log("instance %s", instance, indent=1)
       op_start = self.StartInstanceOp(instance)
-      op_act = opcodes.OpActivateInstanceDisks(instance_name=instance)
+      op_act = opcodes.OpInstanceActivateDisks(instance_name=instance)
       op_deact = opcodes.OpDeactivateInstanceDisks(instance_name=instance)
       op_stop = self.StopInstanceOp(instance)
       Log("activate disks when online", indent=2)