diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index b3e5006c3f4e6877eb5f68204574b201264943b6..7f3f3394cc785539238560edc7777240361a4402 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -47,12 +47,12 @@ If this is None, then we run under the standard VM in interpreted mode only.
 '''
 _mx_graal = mx.suite("graal-core", fatalIfMissing=False)
 
-_r_command_project = 'com.oracle.truffle.r.engine'
+_r_command_package = 'com.oracle.truffle.r.engine'
 _repl_command = 'com.oracle.truffle.tools.debug.shell.client.SimpleREPLClient'
-_command_class_dict = {'r': _r_command_project + ".shell.RCommand",
-                       'rscript': _r_command_project + ".shell.RscriptCommand",
+_command_class_dict = {'r': _r_command_package + ".shell.RCommand",
+                       'rscript': _r_command_package + ".shell.RscriptCommand",
                         'rrepl': _repl_command,
-                        'rembed': _r_command_project + ".shell.REmbedded",
+                        'rembed': _r_command_package + ".shell.REmbedded",
                     }
 # benchmarking support
 def r_path():
@@ -90,7 +90,7 @@ def do_run_r(args, command, extraVmArgs=None, jdk=None, **kwargs):
     if not jdk:
         jdk = get_default_jdk()
 
-    vmArgs = ['-cp', mx.classpath(_r_command_project)]
+    vmArgs = ['-cp', mx.classpath(jdk=jdk)]
 
     if 'nocompile' in kwargs:
         nocompile = True
@@ -113,7 +113,7 @@ def do_run_r(args, command, extraVmArgs=None, jdk=None, **kwargs):
     return mx.run_java(vmArgs + args, jdk=jdk, **kwargs)
 
 def r_classpath(args):
-    print mx.classpath(_r_command_project)
+    print mx.classpath(jdk=mx.get_jdk())
 
 def _sanitize_vmArgs(jdk, vmArgs):
     '''