diff --git a/extensions/hlsl/package.json b/extensions/hlsl/package.json
index ec3d71bab11..280c4563828 100644
--- a/extensions/hlsl/package.json
+++ b/extensions/hlsl/package.json
@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js tgjones/shaders-tmLanguage grammars/hlsl.json ./syntaxes/hlsl.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js tgjones/shaders-tmLanguage grammars/hlsl.json ./syntaxes/hlsl.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
@@ -15,7 +15,7 @@
 		}],
 		"grammars": [{
 			"language": "hlsl",
-			"path": "./syntaxes/hlsl.json",
+			"path": "./syntaxes/hlsl.tmLanguage.json",
 			"scopeName":"source.hlsl"
 		}]
 	}
diff --git a/extensions/hlsl/syntaxes/hlsl.json b/extensions/hlsl/syntaxes/hlsl.tmLanguage.json
similarity index 100%
rename from extensions/hlsl/syntaxes/hlsl.json
rename to extensions/hlsl/syntaxes/hlsl.tmLanguage.json
diff --git a/extensions/html/package.json b/extensions/html/package.json
index a8bbb91b761..21fc673bf67 100644
--- a/extensions/html/package.json
+++ b/extensions/html/package.json
@@ -16,7 +16,7 @@
   "scripts": {
     "compile": "gulp compile-extension:html-client && gulp compile-extension:html-server",
     "postinstall": "cd server && yarn install",
-    "update-grammar": "node ../../build/npm/update-grammar.js textmate/html.tmbundle Syntaxes/HTML.plist ./syntaxes/html.json",
+    "update-grammar": "node ../../build/npm/update-grammar.js textmate/html.tmbundle Syntaxes/HTML.plist ./syntaxes/html.tmLanguage.json",
     "install-client-next": "yarn add vscode-languageclient@next"
   },
   "contributes": {
@@ -57,7 +57,7 @@
       {
         "language": "html",
         "scopeName": "text.html.basic",
-        "path": "./syntaxes/html.json",
+        "path": "./syntaxes/html.tmLanguage.json",
         "embeddedLanguages": {
           "text.html": "html",
           "source.css": "css",
diff --git a/extensions/html/syntaxes/html.json b/extensions/html/syntaxes/html.tmLanguage.json
similarity index 100%
rename from extensions/html/syntaxes/html.json
rename to extensions/html/syntaxes/html.tmLanguage.json
diff --git a/extensions/lua/package.json b/extensions/lua/package.json
index d2388e2352d..067fde1aeee 100644
--- a/extensions/lua/package.json
+++ b/extensions/lua/package.json
@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js textmate/lua.tmbundle Syntaxes/Lua.plist ./syntaxes/lua.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js textmate/lua.tmbundle Syntaxes/Lua.plist ./syntaxes/lua.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
@@ -16,7 +16,7 @@
 		"grammars": [{
 			"language": "lua",
 			"scopeName": "source.lua",
-			"path": "./syntaxes/lua.json"
+			"path": "./syntaxes/lua.tmLanguage.json"
 		}]
 	}
 }
\ No newline at end of file
diff --git a/extensions/lua/syntaxes/lua.json b/extensions/lua/syntaxes/lua.tmLanguage.json
similarity index 100%
rename from extensions/lua/syntaxes/lua.json
rename to extensions/lua/syntaxes/lua.tmLanguage.json
diff --git a/extensions/make/package.json b/extensions/make/package.json
index 1447119db85..59ed17b7955 100644
--- a/extensions/make/package.json
+++ b/extensions/make/package.json
@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js fadeevab/make.tmbundle Syntaxes/Makefile.plist ./syntaxes/Makefile.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js fadeevab/make.tmbundle Syntaxes/Makefile.plist ./syntaxes/make.tmLanguage.json"
 	},
 	"contributes": {
 
@@ -19,7 +19,7 @@
 		"grammars": [{
 			"language": "makefile",
 			"scopeName": "source.makefile",
-			"path": "./syntaxes/Makefile.json"
+			"path": "./syntaxes/make.tmLanguage.json"
 		}],
 		"configurationDefaults": {
 			"[makefile]": {
diff --git a/extensions/make/syntaxes/Makefile.json b/extensions/make/syntaxes/make.tmLanguage.json
similarity index 100%
rename from extensions/make/syntaxes/Makefile.json
rename to extensions/make/syntaxes/make.tmLanguage.json
diff --git a/extensions/razor/package.json b/extensions/razor/package.json
index f15bf8a2a7b..5aa758a9f55 100644
--- a/extensions/razor/package.json
+++ b/extensions/razor/package.json
@@ -6,7 +6,7 @@
     "vscode": "0.10.x"
   },
   "scripts": {
-    "update-grammar": "node ../../build/npm/update-grammar.js demyte/language-cshtml grammars/cshtml.json ./syntaxes/cshtml.json"
+    "update-grammar": "node ../../build/npm/update-grammar.js demyte/language-cshtml grammars/cshtml.json ./syntaxes/cshtml.tmLanguage.json"
   },
 	"contributes": {
 		"languages": [{
@@ -19,7 +19,7 @@
 		"grammars": [{
       "language": "razor",
 			"scopeName": "text.html.cshtml",
-			"path": "./syntaxes/cshtml.json",
+			"path": "./syntaxes/cshtml.tmLanguage.json",
 			"embeddedLanguages": {
 				"section.embedded.source.cshtml": "csharp"
 			}
diff --git a/extensions/razor/syntaxes/cshtml.json b/extensions/razor/syntaxes/cshtml.tmLanguage.json
similarity index 100%
rename from extensions/razor/syntaxes/cshtml.json
rename to extensions/razor/syntaxes/cshtml.tmLanguage.json
diff --git a/extensions/scss/package.json b/extensions/scss/package.json
index 37e3abc67c5..60873e98791 100644
--- a/extensions/scss/package.json
+++ b/extensions/scss/package.json
@@ -4,7 +4,7 @@
     "publisher": "vscode",
     "engines": { "vscode": "*" },
     "scripts": {
-        "update-grammar": "node ../../build/npm/update-grammar.js atom/language-sass grammars/scss.cson ./syntaxes/scss.json"
+        "update-grammar": "node ../../build/npm/update-grammar.js atom/language-sass grammars/scss.cson ./syntaxes/scss.tmLanguage.json"
     },
     "contributes": {
         "languages": [{
@@ -17,7 +17,7 @@
         "grammars": [{
             "language": "scss",
             "scopeName": "source.css.scss",
-            "path": "./syntaxes/scss.json"
+            "path": "./syntaxes/scss.tmLanguage.json"
         }],
         "problemMatchers": [{
             "name": "node-sass",
diff --git a/extensions/scss/syntaxes/scss.json b/extensions/scss/syntaxes/scss.tmLanguage.json
similarity index 100%
rename from extensions/scss/syntaxes/scss.json
rename to extensions/scss/syntaxes/scss.tmLanguage.json
diff --git a/extensions/shaderlab/package.json b/extensions/shaderlab/package.json
index a648a353cb0..2eabed584d2 100644
--- a/extensions/shaderlab/package.json
+++ b/extensions/shaderlab/package.json
@@ -6,7 +6,7 @@
 		"vscode": "*"
 	},
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js tgjones/shaders-tmLanguage grammars/shaderlab.json ./syntaxes/shaderlab.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js tgjones/shaders-tmLanguage grammars/shaderlab.json ./syntaxes/shaderlab.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [
@@ -25,7 +25,7 @@
 		"grammars": [
 			{
 				"language": "shaderlab",
-				"path": "./syntaxes/shaderlab.json",
+				"path": "./syntaxes/shaderlab.tmLanguage.json",
 				"scopeName": "source.shaderlab"
 			}
 		]
diff --git a/extensions/shaderlab/syntaxes/shaderlab.json b/extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json
similarity index 100%
rename from extensions/shaderlab/syntaxes/shaderlab.json
rename to extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json
diff --git a/extensions/xml/package.json b/extensions/xml/package.json
index c9210274b25..8f8bd0d349a 100644
--- a/extensions/xml/package.json
+++ b/extensions/xml/package.json
@@ -80,14 +80,14 @@
 		"grammars": [{
 			"language": "xml",
 			"scopeName": "text.xml",
-			"path": "./syntaxes/xml.json"
+			"path": "./syntaxes/xml.tmLanguage.json"
 		}, {
 			"language": "xsl",
 			"scopeName": "text.xml.xsl",
-			"path": "./syntaxes/xsl.json"
+			"path": "./syntaxes/xsl.tmLanguage.json"
 		}]
 	},
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-xml grammars/xml.cson ./syntaxes/xml.json grammars/xsl.cson ./syntaxes/xsl.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-xml grammars/xml.cson ./syntaxes/xml.tmLanguage.json grammars/xsl.cson ./syntaxes/xsl.tmLanguage.json"
 	}
 }
diff --git a/extensions/xml/syntaxes/xml.json b/extensions/xml/syntaxes/xml.tmLanguage.json
similarity index 100%
rename from extensions/xml/syntaxes/xml.json
rename to extensions/xml/syntaxes/xml.tmLanguage.json
diff --git a/extensions/xml/syntaxes/xsl.json b/extensions/xml/syntaxes/xsl.tmLanguage.json
similarity index 100%
rename from extensions/xml/syntaxes/xsl.json
rename to extensions/xml/syntaxes/xsl.tmLanguage.json
diff --git a/extensions/yaml/package.json b/extensions/yaml/package.json
index fdf800049a7..07ea6da422c 100644
--- a/extensions/yaml/package.json
+++ b/extensions/yaml/package.json
@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js textmate/yaml.tmbundle Syntaxes/YAML.tmLanguage ./syntaxes/yaml.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js textmate/yaml.tmbundle Syntaxes/YAML.tmLanguage ./syntaxes/yaml.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
@@ -18,7 +18,7 @@
 		"grammars": [{
 			"language": "yaml",
 			"scopeName": "source.yaml",
-			"path": "./syntaxes/yaml.json"
+			"path": "./syntaxes/yaml.tmLanguage.json"
 		}],
 		"configurationDefaults": {
 			"[yaml]": {
diff --git a/extensions/yaml/syntaxes/yaml.json b/extensions/yaml/syntaxes/yaml.tmLanguage.json
similarity index 100%
rename from extensions/yaml/syntaxes/yaml.json
rename to extensions/yaml/syntaxes/yaml.tmLanguage.json