diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
index 8a16767daa0e59f1c60b4ff7a76a2b3248b6ca64..c5370e44e0c7d7e9b8eb047dd7dec869be3c562b 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
@@ -104,7 +104,8 @@ import com.oracle.truffle.r.nodes.builtin.fastr.FastRStackTraceNodeGen;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRStats.FastRProfAttr;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRStats.FastRProfFuncounts;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRStats.FastRProfTypecounts;
-import com.oracle.truffle.r.nodes.builtin.query.RNextResQueryBuiltin;
+import com.oracle.truffle.r.nodes.builtin.query.RForceQueryBuiltin;
+import com.oracle.truffle.r.nodes.builtin.query.RForceQueryBuiltinNodeGen;
 import com.oracle.truffle.r.nodes.builtin.query.RTableBuiltin;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRStatsFactory;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRSyntaxTree;
@@ -121,7 +122,6 @@ import com.oracle.truffle.r.nodes.builtin.fastr.FastRTry;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastRTryNodeGen;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastrDqrls;
 import com.oracle.truffle.r.nodes.builtin.fastr.FastrDqrlsNodeGen;
-import com.oracle.truffle.r.nodes.builtin.query.RNextResQueryBuiltinNodeGen;
 import com.oracle.truffle.r.nodes.builtin.query.RTableBuiltinNodeGen;
 import com.oracle.truffle.r.nodes.unary.UnaryNotNode;
 import com.oracle.truffle.r.nodes.unary.UnaryNotNodeGen;
@@ -689,7 +689,7 @@ public class BasePackage extends RBuiltinPackage {
         add(Xtfrm.class, XtfrmNodeGen::create);
 
         // query
-        add(RNextResQueryBuiltin.class, RNextResQueryBuiltinNodeGen::create);
+        add(RForceQueryBuiltin.class, RForceQueryBuiltinNodeGen::create);
         add(RTableBuiltin.class, RTableBuiltinNodeGen::create);
 
         // infix functions
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/query/RNextResQueryBuiltin.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/query/RForceQueryBuiltin.java
similarity index 95%
rename from com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/query/RNextResQueryBuiltin.java
rename to com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/query/RForceQueryBuiltin.java
index 848658b809b4df63e501842700ba38055f07200e..ccb4167d01cb7b30f84f27051a68a4995faa3631 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/query/RNextResQueryBuiltin.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/query/RForceQueryBuiltin.java
@@ -43,11 +43,10 @@ import com.oracle.truffle.r.runtime.data.RList;
 import com.oracle.truffle.r.runtime.env.REnvironment;
 
 /**
- * This builtin takes an object returned by a query and returns a tuple from the result. This tuple
- * is an R environment.
+ * This builtin takes a query and returns a data frame that are the results of this query.
  */
 @RBuiltin(name = "query.force", visibility = OFF, kind = PRIMITIVE, parameterNames = {"query"}, behavior = COMPLEX)
-public abstract class RNextResQueryBuiltin extends RBuiltinNode {
+public abstract class RForceQueryBuiltin extends RBuiltinNode {
     @TruffleBoundary
     @Specialization
     public static final RList force(final REnvironment rQuery) {