--- old/.mx.jvmci/suite.py	2016-05-04 09:42:44.000000000 -1000
+++ new/.mx.jvmci/suite.py	2016-05-04 09:42:43.000000000 -1000
@@ -130,7 +130,7 @@
       "workingSets" : "JVMCI",
     },
 
-    # ------------- JVMCI:HotSpot -------------
+    # ------------- JVMCI:Generic -------------
 
     "jdk.vm.ci.aarch64" : {
       "subDir" : "src/jdk.vm.ci/share/classes",
@@ -159,8 +159,10 @@
       "workingSets" : "JVMCI,SPARC",
     },
 
+    # ------------- JVMCI:HotSpot -------------
+
     "jdk.vm.ci.hotspot" : {
-      "subDir" : "src/jdk.vm.ci/share/classes",
+      "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
       "sourceDirs" : ["src"],
       "dependencies" : [
         "jdk.vm.ci.hotspotvmconfig",
@@ -188,7 +190,7 @@
     },
 
     "jdk.vm.ci.hotspotvmconfig" : {
-      "subDir" : "src/jdk.vm.ci/share/classes",
+      "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
       "sourceDirs" : ["src"],
       "checkstyle" : "jdk.vm.ci.services",
       "javaCompliance" : "1.8",
@@ -196,7 +198,7 @@
     },
 
     "jdk.vm.ci.hotspot.aarch64" : {
-      "subDir" : "src/jdk.vm.ci/share/classes",
+      "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
       "sourceDirs" : ["src"],
       "dependencies" : [
         "jdk.vm.ci.aarch64",
@@ -208,7 +210,7 @@
     },
 
     "jdk.vm.ci.hotspot.amd64" : {
-      "subDir" : "src/jdk.vm.ci/share/classes",
+      "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
       "sourceDirs" : ["src"],
       "dependencies" : [
         "jdk.vm.ci.amd64",
@@ -220,7 +222,7 @@
     },
 
     "jdk.vm.ci.hotspot.sparc" : {
-      "subDir" : "src/jdk.vm.ci/share/classes",
+      "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
       "sourceDirs" : ["src"],
       "dependencies" : [
         "jdk.vm.ci.sparc",
@@ -262,14 +264,14 @@
     },
 
     "JVMCI_HOTSPOTVMCONFIG" : {
-      "subDir" : "src/jdk.vm.ci/share/classes",
+      "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
       "dependencies" : [
         "jdk.vm.ci.hotspotvmconfig",
       ],
     },
 
     "JVMCI_HOTSPOT" : {
-      "subDir" : "src/jdk.vm.ci/share/classes",
+      "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
       "dependencies" : [
         "jdk.vm.ci.hotspot.aarch64",
         "jdk.vm.ci.hotspot.amd64",