diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index 3f45a5b463a47e4fae35b08d1e27e42dcfce7e94..3b67ada8b4ea759fc2ece41c2f661fcb0f8c0026 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -145,7 +145,7 @@ def InitCluster(opts, args):
                         primary_ip_version=primary_ip_version,
                         prealloc_wipe_disks=opts.prealloc_wipe_disks,
                         )
-  op = opcodes.OpPostInitCluster()
+  op = opcodes.OpClusterPostInit()
   SubmitOpCode(op, opts=opts)
   return 0
 
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 1aac802eb0e7c4d0b4ef91d94652508cc0120882..342c8495dc2fdaeef30689a729730d8096540bbc 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1089,7 +1089,7 @@ def _CheckIAllocatorOrNode(lu, iallocator_slot, node_slot):
                                  " iallocator.")
 
 
-class LUPostInitCluster(LogicalUnit):
+class LUClusterPostInit(LogicalUnit):
   """Logical unit for running hooks after cluster initialization.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 24c8bdd6f0ae66c76f0dd4a01b72e1e924317a09..6f41357560a14350fd0298901168194affcc792e 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -371,7 +371,7 @@ class OpCode(BaseOpCode):
 
 # cluster opcodes
 
-class OpPostInitCluster(OpCode):
+class OpClusterPostInit(OpCode):
   """Post cluster initialization.
 
   This opcode does not touch the cluster at all. Its purpose is to run hooks