diff --git a/doc/design-2.1.rst b/doc/design-2.1.rst
index 1b1f3c84caff71e755be13e028fadbb82852dafa..a48f4fdbbeb1761d741ab5ddc2842be9b9393dc8 100644
--- a/doc/design-2.1.rst
+++ b/doc/design-2.1.rst
@@ -780,7 +780,7 @@ We will change Ganeti to use UUIDs for entity tracking, but in a
 staggered way. In 2.1, we will simply add an β€œuuid” attribute to each
 of the instances, nodes and cluster itself. This will be reported on
 instance creation for nodes, and on node adds for the nodes. It will
-be of course avaiblable for querying via the OpQueryNodes/Instance and
+be of course avaiblable for querying via the OpNodeQuery/Instance and
 cluster information, and via RAPI as well.
 
 Note that Ganeti will not provide any way to change this attribute.
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index ed893ffbd663de4309e9cea2d51bcf32ca19f2ba..c2614cd7baabe987a95fc5cbcb5a52141877b2d3 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3598,7 +3598,7 @@ class _NodeQuery(_QueryBase):
                                oob_support, lu.cfg.GetClusterInfo())
 
 
-class LUQueryNodes(NoHooksLU):
+class LUNodeQuery(NoHooksLU):
   """Logical unit for querying nodes.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index f44afb05c732da45cedd16f2f9e6e54b4e97e3de..62c23c2949fc508bd7f9bd97f6707d846fe3c453 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -638,7 +638,7 @@ class OpNodeAdd(OpCode):
     ]
 
 
-class OpQueryNodes(OpCode):
+class OpNodeQuery(OpCode):
   """Compute the list of nodes."""
   OP_ID = "OP_NODE_QUERY"
   OP_PARAMS = [
diff --git a/lib/server/masterd.py b/lib/server/masterd.py
index f87696cc452fefbe92b9ea9c41fa32102dc0545c..6be328384073f6011e2de0ac1147422c5857db45 100644
--- a/lib/server/masterd.py
+++ b/lib/server/masterd.py
@@ -288,8 +288,8 @@ class ClientOps:
       if use_locking:
         raise errors.OpPrereqError("Sync queries are not allowed",
                                    errors.ECODE_INVAL)
-      op = opcodes.OpQueryNodes(names=names, output_fields=fields,
-                                use_locking=use_locking)
+      op = opcodes.OpNodeQuery(names=names, output_fields=fields,
+                               use_locking=use_locking)
       return self._Query(op)
 
     elif method == luxi.REQ_QUERY_GROUPS:
diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index ca896ae165f046761d7da4b1b750bcf90073a0ea..fda20a175089ec537448803fd77ff7cfb85a646d 100644
--- a/lib/watcher/__init__.py
+++ b/lib/watcher/__init__.py
@@ -418,8 +418,8 @@ def GetClusterData():
   op1 = opcodes.OpInstanceQuery(output_fields=op1_fields, names=[],
                                 use_locking=True)
   op2_fields = ["name", "bootid", "offline"]
-  op2 = opcodes.OpQueryNodes(output_fields=op2_fields, names=[],
-                             use_locking=True)
+  op2 = opcodes.OpNodeQuery(output_fields=op2_fields, names=[],
+                            use_locking=True)
 
   job_id = client.SubmitJob([op1, op2])
 
diff --git a/tools/burnin b/tools/burnin
index 7b2c4b7a43e7f465cedf202e0fb94ba11961fff0..c55a5699c0fb73867fa4cfc0e821c6b6a9364d94 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -502,8 +502,8 @@ class Burner(object):
     else:
       names = []
     try:
-      op = opcodes.OpQueryNodes(output_fields=["name", "offline", "drained"],
-                                names=names, use_locking=True)
+      op = opcodes.OpNodeQuery(output_fields=["name", "offline", "drained"],
+                               names=names, use_locking=True)
       result = self.ExecOp(True, op)
     except errors.GenericError, err:
       err_code, msg = cli.FormatError(err)