diff --git a/lib/cli.py b/lib/cli.py
index 6edd7b643b673bccb7410b6129d9966160154467..f59668b6b0e9cbe05c611757c14e6179a65c0c9c 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -439,7 +439,7 @@ def RemoveTags(opts, args):
   _ExtendTags(opts, args)
   if not args:
     raise errors.OpPrereqError("No tags to be removed")
-  op = opcodes.OpDelTags(kind=kind, name=name, tags=args)
+  op = opcodes.OpTagsDel(kind=kind, name=name, tags=args)
   SubmitOpCode(op, opts=opts)
 
 
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index f8a02bdd584bbc26febc45de75ac143e821de953..f6728cb3d033a643cf0ddcf3baa4ee1df6297021 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -10500,7 +10500,7 @@ class LUAddTags(TagsLU):
     self.cfg.Update(self.target, feedback_fn)
 
 
-class LUDelTags(TagsLU):
+class LUTagsDel(TagsLU):
   """Delete a list of tags from a given object.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index d0c0ef448fde433ca3498366c5e6701a6d0a3a74..3c7355fe07baf73f013383a03548dd1c1fb1826c 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1187,7 +1187,7 @@ class OpAddTags(OpCode):
     ]
 
 
-class OpDelTags(OpCode):
+class OpTagsDel(OpCode):
   """Remove a list of tags from a given object."""
   OP_ID = "OP_TAGS_DEL"
   OP_PARAMS = [
diff --git a/lib/rapi/baserlib.py b/lib/rapi/baserlib.py
index d30f0cddf3388ae76c9e8e55608d7770d77b6b9f..fbafa2766518d5944f18789679b0b6250b10b659 100644
--- a/lib/rapi/baserlib.py
+++ b/lib/rapi/baserlib.py
@@ -123,7 +123,7 @@ def _Tags_DELETE(kind, tags, name, dry_run):
   """Helper function to delete tags.
 
   """
-  return SubmitJob([opcodes.OpDelTags(kind=kind, name=name,
+  return SubmitJob([opcodes.OpTagsDel(kind=kind, name=name,
                                       tags=tags, dry_run=dry_run)])