diff --git a/atom-extensions/atom-cf-manifest-yaml-language/.gitignore b/atom-extensions/atom-cf-manifest-yaml-language/.gitignore
deleted file mode 100644
index 4d64059f6..000000000
--- a/atom-extensions/atom-cf-manifest-yaml-language/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/node_modules
-
diff --git a/atom-extensions/atom-cf-manifest-yaml-language/package.json b/atom-extensions/atom-cf-manifest-yaml-language/package.json
deleted file mode 100644
index 3fd5572f6..000000000
--- a/atom-extensions/atom-cf-manifest-yaml-language/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "language-cf-manifest-yaml",
-  "version": "0.1.0",
-  "description": "CF Deployment Manifest YAML language support in Atom",
-  "license": "MIT",
-  "engines": {
-    "atom": "*",
-    "node": "*"
-  },
-  "homepage": "http://pivotalcf.io",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/spring-projects/sts4.git"
-  },
-  "bugs": {
-    "url": "https://github.com/spring-projects/sts4/issues"
-  },
-  "devDependencies": {
-    "coffeelint": "^1.10.1"
-  }
-}
\ No newline at end of file
diff --git a/atom-extensions/atom-cf-manifest-yaml-language/coffeelint.json b/atom-extensions/atom-manifest-yaml/coffeelint.json
similarity index 100%
rename from atom-extensions/atom-cf-manifest-yaml-language/coffeelint.json
rename to atom-extensions/atom-manifest-yaml/coffeelint.json
diff --git a/atom-extensions/atom-cf-manifest-yaml-language/grammars/cf-manifest-yaml.cson b/atom-extensions/atom-manifest-yaml/grammars/cf-manifest-yaml.cson
similarity index 100%
rename from atom-extensions/atom-cf-manifest-yaml-language/grammars/cf-manifest-yaml.cson
rename to atom-extensions/atom-manifest-yaml/grammars/cf-manifest-yaml.cson
diff --git a/atom-extensions/atom-manifest-yaml/package.json b/atom-extensions/atom-manifest-yaml/package.json
index 7ea1412f5..f7ca7ab48 100644
--- a/atom-extensions/atom-manifest-yaml/package.json
+++ b/atom-extensions/atom-manifest-yaml/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "manifest-yaml",
+  "name": "cf-manifest-yaml",
   "main": "./lib/main",
   "version": "0.1.0",
   "description": "Cloud Foundry Deployment Manifest YAML support for Atom",
@@ -15,6 +15,9 @@
     "remote-file-size": "^3.0.3",
     "atom-commons": "file:../atom-commons"
   },
+  "devDependencies": {
+    "coffeelint": "^1.10.1"
+  },
   "scripts": {
     "clean": "rm -fr node_modules"
   },
diff --git a/atom-extensions/atom-cf-manifest-yaml-language/settings/language-cf-manifest-yaml.cson b/atom-extensions/atom-manifest-yaml/settings/language-cf-manifest-yaml.cson
similarity index 100%
rename from atom-extensions/atom-cf-manifest-yaml-language/settings/language-cf-manifest-yaml.cson
rename to atom-extensions/atom-manifest-yaml/settings/language-cf-manifest-yaml.cson