--- a/mx/commands.py	Mon Apr 15 12:55:46 2013 +0200
+++ b/mx/commands.py	Mon Apr 15 14:27:37 2013 +0200
@@ -39,7 +39,7 @@
 _vmSourcesAvailable = exists(join(_graal_home, 'make')) and exists(join(_graal_home, 'src'))
 
 """ The VMs that can be built and run - default is first in list """
-_vmChoices = ['graal', 'server', 'client', 'server-nograal', 'client-nograal', 'boot']
+_vmChoices = ['graal', 'server', 'client', 'server-nograal', 'client-nograal', 'original']
 
 """ The VM that will be run by the 'vm' command and built by default by the 'build' command.
     This can be set via the global '--vm' option. """
@@ -339,15 +339,15 @@
                         assert len(parts) == 2, parts
                         assert parts[1] == 'KNOWN', parts[1]
                         defaultVM = parts[0][1:]
-                        jvmCfgLines += ['# boot VM is a copy of the unmodified ' + defaultVM + ' VM\n']
-                        jvmCfgLines += ['-boot KNOWN\n']
+                        jvmCfgLines += ['# default VM is a copy of the unmodified ' + defaultVM + ' VM\n']
+                        jvmCfgLines += ['-original KNOWN\n']
                     else:
                         jvmCfgLines += [line]
 
             assert defaultVM is not None, 'Could not find default VM in ' + jvmCfg
             if mx.get_os() != 'windows':
                 chmodRecursive(jdk, 0755)
-            shutil.move(join(_vmLibDirInJdk(jdk), defaultVM), join(_vmLibDirInJdk(jdk), 'boot'))
+            shutil.move(join(_vmLibDirInJdk(jdk), defaultVM), join(_vmLibDirInJdk(jdk), 'original'))
             
 
             with open(jvmCfg, 'w') as fp:
@@ -571,7 +571,9 @@
     if vm is None:
         vm = _vm
 
-    if vm.startswith('server') or vm == 'boot':
+    if vm == 'original':
+        pass
+    elif vm.startswith('server'):
         buildSuffix = ''
     elif vm.startswith('client'):
         buildSuffix = '1'
@@ -590,9 +592,9 @@
 
         jdk = _jdk(build, create=True)
 
-        if vm == 'boot':
+        if vm == 'original':
             if build != 'product':
-                mx.log('only product build of boot VM exists')
+                mx.log('only product build of original VM exists')
             continue
 
         vmDir = join(_vmLibDirInJdk(jdk), vm)
@@ -824,7 +826,7 @@
     def harness(projectscp, vmArgs):
         if not exists(javaClass) or getmtime(javaClass) < getmtime(javaSource):
             subprocess.check_call([mx.java().javac, '-cp', projectscp, '-d', mxdir, javaSource])
-        if _vm == 'boot' or _vm.endswith('nograal'):
+        if _vm == 'original' or _vm.endswith('nograal'):
             prefixArgs = ['-esa', '-ea']
         else:
             prefixArgs = ['-XX:-BootstrapGraal', '-esa', '-ea']
@@ -882,7 +884,7 @@
     allStart = time.time()
     for v in vms:
         for vmbuild in builds:
-            if v == 'boot' and vmbuild != 'product':
+            if v == 'original' and vmbuild != 'product':
                 continue
             if not args.console:
                 logFile = join(v + '-' + vmbuild + '.log')