diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py
index 8910f342325379dfa09aa9aea03692423f630132..e5a4082be458aa50fb08f664acfdbc61e4355ed5 100644
--- a/lib/client/gnt_node.py
+++ b/lib/client/gnt_node.py
@@ -459,7 +459,7 @@ def PowercycleNode(opts, args):
       not AskUser("Are you sure you want to hard powercycle node %s?" % node)):
     return 2
 
-  op = opcodes.OpPowercycleNode(node_name=node, force=opts.force)
+  op = opcodes.OpNodePowercycle(node_name=node, force=opts.force)
   result = SubmitOpCode(op, opts=opts)
   if result:
     ToStderr(result)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index d5c4252c0c18ab70d8f663397a0b89233c9a9935..ed893ffbd663de4309e9cea2d51bcf32ca19f2ba 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4484,7 +4484,7 @@ class LUSetNodeParams(LogicalUnit):
     return result
 
 
-class LUPowercycleNode(NoHooksLU):
+class LUNodePowercycle(NoHooksLU):
   """Powercycles a node.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 32731dbd74209eb313183850e58d10e5ffe435fc..f44afb05c732da45cedd16f2f9e6e54b4e97e3de 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -710,7 +710,7 @@ class OpSetNodeParams(OpCode):
     ]
 
 
-class OpPowercycleNode(OpCode):
+class OpNodePowercycle(OpCode):
   """Tries to powercycle a node."""
   OP_ID = "OP_NODE_POWERCYCLE"
   OP_DSC_FIELD = "node_name"