diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index f6728cb3d033a643cf0ddcf3baa4ee1df6297021..e03bf49073df5d6d03dc54630a7df3c121b48a83 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -10414,7 +10414,7 @@ class TagsLU(NoHooksLU): # pylint: disable-msg=W0223
                                  str(self.op.kind), errors.ECODE_INVAL)
 
 
-class LUGetTags(TagsLU):
+class LUTagsGet(TagsLU):
   """Returns the tags of a given object.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 3c7355fe07baf73f013383a03548dd1c1fb1826c..505d32074ea2e7e03617413a367b17698157114d 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1156,7 +1156,7 @@ class OpBackupRemove(OpCode):
 
 
 # Tags opcodes
-class OpGetTags(OpCode):
+class OpTagsGet(OpCode):
   """Returns the tags of the given object."""
   OP_ID = "OP_TAGS_GET"
   OP_DSC_FIELD = "name"
diff --git a/lib/server/masterd.py b/lib/server/masterd.py
index 6be328384073f6011e2de0ac1147422c5857db45..72b1466de74c26fd705be8c5b8717f39cfc6d5f7 100644
--- a/lib/server/masterd.py
+++ b/lib/server/masterd.py
@@ -324,7 +324,7 @@ class ClientOps:
     elif method == luxi.REQ_QUERY_TAGS:
       kind, name = args
       logging.info("Received tags query request")
-      op = opcodes.OpGetTags(kind=kind, name=name)
+      op = opcodes.OpTagsGet(kind=kind, name=name)
       return self._Query(op)
 
     elif method == luxi.REQ_QUERY_LOCKS:
diff --git a/test/ganeti.jqueue_unittest.py b/test/ganeti.jqueue_unittest.py
index 1ca15d23bb1c3e0c7fb9f634e2e399ef17a3209c..913792724dd08050b11e4741231b552b42806f91 100755
--- a/test/ganeti.jqueue_unittest.py
+++ b/test/ganeti.jqueue_unittest.py
@@ -268,7 +268,7 @@ class TestQueuedOpCode(unittest.TestCase):
       self.assertEqual(op.priority, constants.OP_PRIO_HIGH)
       self.assertEqual(op.status, constants.OP_STATUS_QUEUED)
 
-    inpop = opcodes.OpGetTags(priority=constants.OP_PRIO_HIGH)
+    inpop = opcodes.OpTagsGet(priority=constants.OP_PRIO_HIGH)
     op1 = jqueue._QueuedOpCode(inpop)
     _Check(op1)
     op2 = jqueue._QueuedOpCode.Restore(op1.Serialize())
@@ -284,7 +284,7 @@ class TestQueuedJob(unittest.TestCase):
   def testDefaults(self):
     job_id = 4260
     ops = [
-      opcodes.OpGetTags(),
+      opcodes.OpTagsGet(),
       opcodes.OpTestDelay(),
       ]
 
@@ -314,7 +314,7 @@ class TestQueuedJob(unittest.TestCase):
   def testPriority(self):
     job_id = 4283
     ops = [
-      opcodes.OpGetTags(priority=constants.OP_PRIO_DEFAULT),
+      opcodes.OpTagsGet(priority=constants.OP_PRIO_DEFAULT),
       opcodes.OpTestDelay(),
       ]