diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index f3de68f2d282a233f0bc068437c1d698320e3e53..39c1a4e0e026bb1fef8630371aa3d5323270a1ff 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -457,10 +457,10 @@ def VerifyDisks(opts, args):
   """
   cl = GetClient()
 
-  op = opcodes.OpVerifyDisks()
+  op = opcodes.OpClusterVerifyDisks()
   result = SubmitOpCode(op, opts=opts, cl=cl)
   if not isinstance(result, (list, tuple)) or len(result) != 3:
-    raise errors.ProgrammerError("Unknown result type for OpVerifyDisks")
+    raise errors.ProgrammerError("Unknown result type for OpClusterVerifyDisks")
 
   bad_nodes, instances, missing = result
 
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index d5e4df3375fa6502661ec3e30640cb439a56d319..82a37bbf24f2d305ab4f4084c09b2eee35ba8b6d 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2381,7 +2381,7 @@ class LUClusterVerify(LogicalUnit):
       return lu_result
 
 
-class LUVerifyDisks(NoHooksLU):
+class LUClusterVerifyDisks(NoHooksLU):
   """Verifies the cluster disks status.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 277a8f1f970587027f920d71b582b5cb2ef0631b..e63795534e045a8c692e0a3ca8d967f35e24c226 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -416,7 +416,7 @@ class OpClusterVerify(OpCode):
     ]
 
 
-class OpVerifyDisks(OpCode):
+class OpClusterVerifyDisks(OpCode):
   """Verify the cluster disks.
 
   Parameters: none
diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index 9abdade4209353d7b48c7c548ee830c485ddb5f8..6a01ef321dcc9ccbd0b4d2413a8ab256e89f9f48 100644
--- a/lib/watcher/__init__.py
+++ b/lib/watcher/__init__.py
@@ -580,7 +580,7 @@ class Watcher(object):
     """Run gnt-cluster verify-disks.
 
     """
-    op = opcodes.OpVerifyDisks()
+    op = opcodes.OpClusterVerifyDisks()
     job_id = client.SubmitJob([op])
     result = cli.PollJob(job_id, cl=client, feedback_fn=logging.debug)[0]
     client.ArchiveJob(job_id)