diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json
index 481cb5a5d..54d8ec5a3 100644
--- a/atom-extensions/atom-commons/package.json
+++ b/atom-extensions/atom-commons/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "atom-commons",
+  "name": "pivotal-atom-languageclient-commons",
   "version": "0.1.0",
-  "description": "Atom Commons for STS4",
+  "description": "Atom language client commons for STS4 language servers",
   "repository": "https://github.com/spring-projects/sts4",
   "license": "MIT",
   "engines": {
@@ -9,7 +9,7 @@
   },
   "main": "./dist/index",
   "dependencies": {
-    "atom-languageclient": "https://github.com/atom/atom-languageclient#master",
+    "atom-languageclient": "git://github.com/BoykoAlex/atom-languageclient#grammar-override",
     "decompress": "^4.2.0",
     "portfinder": "^1.0.13",
     "remote-file-size": "^3.0.3",
diff --git a/atom-extensions/atom-manifest-yaml/lib/main.js b/atom-extensions/atom-manifest-yaml/lib/main.js
index 24f88d4ca..fa269aa78 100644
--- a/atom-extensions/atom-manifest-yaml/lib/main.js
+++ b/atom-extensions/atom-manifest-yaml/lib/main.js
@@ -1,5 +1,5 @@
 const path = require('path');
-const { JarLanguageClient } = require('atom-commons');
+const { JarLanguageClient } = require('pivotal-atom-languageclient-commons');
 
 class ManifestYamlLanguageClient extends JarLanguageClient {
 
diff --git a/atom-extensions/atom-manifest-yaml/package.json b/atom-extensions/atom-manifest-yaml/package.json
index a3624b053..fe0f751b5 100644
--- a/atom-extensions/atom-manifest-yaml/package.json
+++ b/atom-extensions/atom-manifest-yaml/package.json
@@ -1,18 +1,23 @@
 {
-  "name": "cf-manifest-yaml",
+  "name": "pivotal-atom-cf-manifest-yaml",
   "main": "./lib/main",
-  "version": "0.1.0",
+  "version": "0.0.1",
   "description": "Cloud Foundry Deployment Manifest YAML support for Atom",
-  "repository": "https://github.com/spring-projects/sts4",
+  "repository": "https://github.com/spring-projects/sts4/atom-extensions/atom-manifest-yaml",
   "license": "MIT",
   "engines": {
     "atom": ">=1.17.0"
   },
+  "files": [
+    "grammars/",
+    "settings/",
+    "lib/"
+  ],
   "dependencies": {
     "decompress": "^4.2.0",
     "portfinder": "^1.0.13",
     "remote-file-size": "^3.0.3",
-    "atom-commons": "file:../atom-commons"
+    "pivotal-atom-languageclient-commons": "file:../atom-commons"
   },
   "devDependencies": {
     "coffeelint": "^1.10.1"