diff --git a/lib/client/gnt_group.py b/lib/client/gnt_group.py
index 063928f9b51bd8d40e0cbb2fd1b827fc87a3679a..d3041ab279d3327590c1048b05c16f301f160fea 100644
--- a/lib/client/gnt_group.py
+++ b/lib/client/gnt_group.py
@@ -45,7 +45,7 @@ def AddGroup(opts, args):
 
   """
   (group_name,) = args
-  op = opcodes.OpAddGroup(group_name=group_name, ndparams=opts.ndparams,
+  op = opcodes.OpGroupAdd(group_name=group_name, ndparams=opts.ndparams,
                           alloc_policy=opts.alloc_policy)
   SubmitOpCode(op, opts=opts)
 
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 82a37bbf24f2d305ab4f4084c09b2eee35ba8b6d..ecf0bc9ec5d9de493b7b6acfac4fe296513c0ed2 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -9916,7 +9916,7 @@ class LUBackupRemove(NoHooksLU):
                   " Domain Name.")
 
 
-class LUAddGroup(LogicalUnit):
+class LUGroupAdd(LogicalUnit):
   """Logical unit for creating node groups.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index e63795534e045a8c692e0a3ca8d967f35e24c226..4f6ed28dad251819185ab71f984972bd0a7cdc51 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1015,7 +1015,7 @@ class OpGrowDisk(OpCode):
 
 # Node group opcodes
 
-class OpAddGroup(OpCode):
+class OpGroupAdd(OpCode):
   """Add a node group to the cluster."""
   OP_ID = "OP_GROUP_ADD"
   OP_DSC_FIELD = "group_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index e54509ee4525aa187e451bd028707f66e13a441e..d1bd1c0c97babb84094935be0046b6dede2b30a2 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -551,14 +551,14 @@ class R_2_nodes_name_storage_repair(baserlib.R_Generic):
 def _ParseCreateGroupRequest(data, dry_run):
   """Parses a request for creating a node group.
 
-  @rtype: L{opcodes.OpAddGroup}
+  @rtype: L{opcodes.OpGroupAdd}
   @return: Group creation opcode
 
   """
   group_name = baserlib.CheckParameter(data, "name")
   alloc_policy = baserlib.CheckParameter(data, "alloc_policy", default=None)
 
-  return opcodes.OpAddGroup(group_name=group_name,
+  return opcodes.OpGroupAdd(group_name=group_name,
                             alloc_policy=alloc_policy,
                             dry_run=dry_run)