diff --git a/configs/client-default.js b/configs/client-default.js
index 550221b9..319879dd 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -308,13 +308,13 @@ module.exports = function(options) {
             staticPrefix: staticPrefix,
             workerPrefix: options.CORSWorkerPrefix // "/static/standalone/worker"
         },
-        "plugins/c9.ide.language/keyhandler",
-        "plugins/c9.ide.language/complete",
-        "plugins/c9.ide.language/quickfix",
-        "plugins/c9.ide.language/marker",
-        "plugins/c9.ide.language/refactor",
-        "plugins/c9.ide.language/tooltip",
-        "plugins/c9.ide.language/jumptodef",
+        "plugins/c9.ide.language.core/keyhandler",
+        "plugins/c9.ide.language.core/complete",
+        "plugins/c9.ide.language.core/quickfix",
+        "plugins/c9.ide.language.core/marker",
+        "plugins/c9.ide.language.core/refactor",
+        "plugins/c9.ide.language.core/tooltip",
+        "plugins/c9.ide.language.core/jumptodef",
         "plugins/c9.ide.language/worker_util_helper",
         {
             packagePath: "plugins/c9.ide.language.generic/generic",
diff --git a/package.json b/package.json
index faf386f5..ba2da062 100644
--- a/package.json
+++ b/package.json
@@ -58,18 +58,18 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#57be17654e",
-        "c9.ide.language.core": "#undefined",
-        "c9.ide.language.css": "#605d0860c0",
+        "c9.ide.language": "#eb4b0cd95a",
+        "c9.ide.language.core": "#82e9ed1729",
+        "c9.ide.language.css": "#46ad561506",
         "c9.ide.language.generic": "#b47cbe58f9",
         "c9.ide.language.html": "#6ecb73a17b",
         "c9.ide.language.html.diff": "#7d6cecfb90",
-        "c9.ide.language.javascript": "#4b525dd640",
+        "c9.ide.language.javascript": "#f91500296c",
         "c9.ide.language.javascript.immediate": "#82c426dbca",
         "c9.ide.language.javascript.eslint": "#cb9e3f5a8e",
-        "c9.ide.language.javascript.tern": "#47e2d4e867",
+        "c9.ide.language.javascript.tern": "#4dedbbef74",
         "c9.ide.language.javascript.infer": "#b9c2e4bdb8",
-        "c9.ide.language.jsonalyzer": "#0d7d2ccb9f",
+        "c9.ide.language.jsonalyzer": "#d5444f6b2c",
         "c9.ide.language.codeintel": "#4e0a272229",
         "c9.ide.collab": "#79b094a770",
         "c9.ide.local": "#9169fec157",
@@ -116,7 +116,7 @@
         "c9.ide.scm": "#637a68cd04",
         "c9.ide.terminal.monitor": "#affa33572f",
         "c9.ide.test": "#102942ae4e",
-        "c9.ide.test.mocha": "#fc053b23d2",
+        "c9.ide.test.mocha": "#38151a98c3",
         "c9.ide.theme.flat": "#81dadeee55",
         "c9.ide.threewaymerge": "#229382aa0b",
         "c9.ide.undo": "#b028bcb4d5",
diff --git a/scripts/makelocal.sh b/scripts/makelocal.sh
index 0d585e44..476edce6 100755
--- a/scripts/makelocal.sh
+++ b/scripts/makelocal.sh
@@ -31,7 +31,7 @@ CDN="../server.js $CDN_SETTINGS --settings local --version=standalone --cache $C
 mkdir -p "$CACHE/standalone/modules/lib/emmet"
 cp "$CURDIR/../node_modules/emmet/emmet.js" "$CACHE/standalone/modules/lib/emmet/"
 
-WORKER=plugins/c9.ide.language/worker
+WORKER=plugins/c9.ide.language.core/worker
 echo building worker $WORKER
 $CDN --worker $WORKER
 echo $CDN --worker $WORKER
diff --git a/scripts/makestandalone.sh b/scripts/makestandalone.sh
index 9fe3aefa..622efe2e 100755
--- a/scripts/makestandalone.sh
+++ b/scripts/makestandalone.sh
@@ -31,7 +31,7 @@ CDN="$CURDIR/../server.js cdn-cli -s standalone --server-config standalone --ser
 # build async loaded ace modules
 $CDN --module ace
 
-WORKER=plugins/c9.ide.language/worker
+WORKER=plugins/c9.ide.language.core/worker
 echo building worker $WORKER
 $CDN --worker $WORKER
 echo $CDN --worker $WORKER