diff --git a/lib/client/gnt_group.py b/lib/client/gnt_group.py
index 9ec8cd408ea8d839c2576e1b6232d39027ff330c..e0f2c42607903dabe9ac543258ceaf08bbbfbcb0 100644
--- a/lib/client/gnt_group.py
+++ b/lib/client/gnt_group.py
@@ -161,7 +161,7 @@ def RemoveGroup(opts, args):
 
   """
   (group_name,) = args
-  op = opcodes.OpRemoveGroup(group_name=group_name)
+  op = opcodes.OpGroupRemove(group_name=group_name)
   SubmitOpCode(op, opts=opts)
 
 
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index c3c675ce34423281ba0840727bf3088c37be1274..7736416b9346b820b5fcf540602799fb3dc66d2f 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -10252,7 +10252,7 @@ class LUSetGroupParams(LogicalUnit):
 
 
 
-class LURemoveGroup(LogicalUnit):
+class LUGroupRemove(LogicalUnit):
   HPATH = "group-remove"
   HTYPE = constants.HTYPE_GROUP
   REQ_BGL = False
diff --git a/lib/opcodes.py b/lib/opcodes.py
index f35c3a75787f4b52cc4061ef84058c02dd8da440..d9d67baf38296a1c283c5cc29e1a38d9339f5581 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1059,7 +1059,7 @@ class OpSetGroupParams(OpCode):
     ]
 
 
-class OpRemoveGroup(OpCode):
+class OpGroupRemove(OpCode):
   """Remove a node group from the cluster."""
   OP_ID = "OP_GROUP_REMOVE"
   OP_DSC_FIELD = "group_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 4c378dbf03316f8ac807a98ec1aacf86be1a5514..99561027d3af064aad466f2b8847b9b6fe237698 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -614,7 +614,7 @@ class R_2_groups_name(baserlib.R_Generic):
     """Delete a node group.
 
     """
-    op = opcodes.OpRemoveGroup(group_name=self.items[0],
+    op = opcodes.OpGroupRemove(group_name=self.items[0],
                                dry_run=bool(self.dryRun()))
 
     return baserlib.SubmitJob([op])