diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index cc7e2d8845adccd5c4c97d3a5faaa9d90ecfc3bc..35ac373edda9bc708c20a3a7fdd32bf8c93f7f35 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -198,7 +198,7 @@ def RenameCluster(opts, args):
     if not AskUser(usertext):
       return 1
 
-  op = opcodes.OpRenameCluster(name=new_name)
+  op = opcodes.OpClusterRename(name=new_name)
   result = SubmitOpCode(op, opts=opts, cl=cl)
 
   if result:
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index e6231a95716e030f71e9224cd48ca53e4536789c..761781ce12768470a1b5c7cd4dd58fd6f44a4d16 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2571,7 +2571,7 @@ class LURepairDiskSizes(NoHooksLU):
     return changed
 
 
-class LURenameCluster(LogicalUnit):
+class LUClusterRename(LogicalUnit):
   """Rename the cluster.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index dcb46e34627be95201e194fa0366b4e91c2455ae..052b36cf640152b0071b92d890daae975ce1a857 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -470,7 +470,7 @@ class OpClusterConfigQuery(OpCode):
     ]
 
 
-class OpRenameCluster(OpCode):
+class OpClusterRename(OpCode):
   """Rename the cluster.
 
   @type name: C{str}