diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index 90c4a5123f8b8e63ca043bb99081514fe3198407..99fc31ef2b186a18e749dadcabf8b121c7db7662 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -578,7 +578,7 @@ def SearchTags(opts, args):
   @return: the desired exit code
 
   """
-  op = opcodes.OpSearchTags(pattern=args[0])
+  op = opcodes.OpTagsSearch(pattern=args[0])
   result = SubmitOpCode(op, opts=opts)
   if not result:
     return 1
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index e03bf49073df5d6d03dc54630a7df3c121b48a83..7dd064458194d7b7901247a147f762755dc0eb0d 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -10433,7 +10433,7 @@ class LUTagsGet(TagsLU):
     return list(self.target.GetTags())
 
 
-class LUSearchTags(NoHooksLU):
+class LUTagsSearch(NoHooksLU):
   """Searches the tags for a given pattern.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 505d32074ea2e7e03617413a367b17698157114d..ffb13594e7e834351921dafb249547adce1a211e 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1167,7 +1167,7 @@ class OpTagsGet(OpCode):
     ]
 
 
-class OpSearchTags(OpCode):
+class OpTagsSearch(OpCode):
   """Searches the tags in the cluster for a given pattern."""
   OP_ID = "OP_TAGS_SEARCH"
   OP_DSC_FIELD = "pattern"