diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js
index 2e08b86eb7c..a8410588061 100644
--- a/build/gulpfile.extensions.js
+++ b/build/gulpfile.extensions.js
@@ -26,7 +26,7 @@ var extensionsPath = path.join(path.dirname(__dirname), 'extensions');
 
 function getTSConfig(plugin) {
 	var script = (plugin.desc && plugin.desc.scripts && plugin.desc.scripts['vscode:prepublish']) || '';
-	var match = /^node \.\.\/\.\.\/node\_modules\/gulp\/bin\/gulp\.js \-\-gulpfile \.\.\/\.\.\/build\/gulpfile\.extensions\.js compile-plugin:([^ ]+) ?(.*tsconfig\.json)/.exec(script);
+	var match = /^node \.\.\/\.\.\/node\_modules\/gulp\/bin\/gulp\.js \-\-gulpfile \.\.\/\.\.\/build\/gulpfile\.extensions\.js compile-extension:([^ ]+) ?(.*tsconfig\.json)/.exec(script);
 
 	if (!match) {
 		return;
@@ -72,9 +72,9 @@ var tasks = readAllPlugins()
 
 		var name = plugin.desc.name;
 		var pluginRoot = path.join(extensionsPath, name);
-		var clean = 'clean-plugin:' + name;
-		var compile = 'compile-plugin:' + name;
-		var watch = 'watch-plugin:' + name;
+		var clean = 'clean-extension:' + name;
+		var compile = 'compile-extension:' + name;
+		var watch = 'watch-extension:' + name;
 
 		var sources = 'extensions/' + name + '/src/**';
 		var deps = [
@@ -136,6 +136,6 @@ var tasks = readAllPlugins()
 	})
 	.filter(function(task) { return !!task; });
 
-gulp.task('clean-plugins', tasks.map(function (t) { return t.clean; }));
-gulp.task('compile-plugins', tasks.map(function (t) { return t.compile; }));
-gulp.task('watch-plugins', tasks.map(function (t) { return t.watch; }));
\ No newline at end of file
+gulp.task('clean-extensions', tasks.map(function (t) { return t.clean; }));
+gulp.task('compile-extensions', tasks.map(function (t) { return t.compile; }));
+gulp.task('watch-extensions', tasks.map(function (t) { return t.watch; }));
\ No newline at end of file
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index f054156a22d..d92a40230a8 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -77,7 +77,7 @@ var BUNDLED_FILE_HEADER = [
 ].join('\n');
 
 gulp.task('clean-optimized-vscode', util.rimraf('out-vscode'));
-gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compile-plugins'], common.optimizeTask({
+gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compile-extensions'], common.optimizeTask({
 	entryPoints: vscodeEntryPoints,
 	otherSources: [],
 	resources: vscodeResources,
diff --git a/extensions/javascript-migration/package.json b/extensions/javascript-migration/package.json
index 617bdb90fa3..c22e858a989 100644
--- a/extensions/javascript-migration/package.json
+++ b/extensions/javascript-migration/package.json
@@ -17,7 +17,7 @@
 	"main": "./out/extension",
 
 	"scripts": {
-		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-plugin:javascript-migration ./src/tsconfig.json"
+		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:javascript-migration ./src/tsconfig.json"
 	},
 	"devDependencies": {
 		"typescript": "^1.7.5",
diff --git a/extensions/json/package.json b/extensions/json/package.json
index 724db4e38bb..4590cc6dad9 100644
--- a/extensions/json/package.json
+++ b/extensions/json/package.json
@@ -10,7 +10,7 @@
 	],
 	"main": "./out/jsonMain",
 	"scripts": {
-		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-plugin:json ./src/tsconfig.json",
+		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:json ./src/tsconfig.json",
 		"postinstall": "cd server && npm install && npm run compile && cd .."
 	},
 	"contributes": {
diff --git a/extensions/php/package.json b/extensions/php/package.json
index 526d5b97ab1..706cee0c239 100644
--- a/extensions/php/package.json
+++ b/extensions/php/package.json
@@ -41,6 +41,6 @@
 		}
 	},
 	"scripts": {
-		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-plugin:php ./src/tsconfig.json"
+		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:php ./src/tsconfig.json"
 	}
 }
\ No newline at end of file
diff --git a/extensions/typescript/package.json b/extensions/typescript/package.json
index dbe6315a285..9c9e1c31dba 100644
--- a/extensions/typescript/package.json
+++ b/extensions/typescript/package.json
@@ -14,7 +14,7 @@
     "vscode-extension-telemetry": "^0.0.4"
 	},
 	"scripts": {
-		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-plugin:typescript ./src/tsconfig.json"
+		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript ./src/tsconfig.json"
 	},
 	"activationEvents": [
 		"onLanguage:javascript",
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index 0f5bada1665..f1f63f1021a 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -9,7 +9,7 @@
 	},
 	"scripts": {
 		"compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
-		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-plugin:vscode-api-tests ./tsconfig.json",
+		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-api-tests ./tsconfig.json",
 		"postinstall": "node ./node_modules/vscode/bin/install"
 	},
 	"devDependencies": {
diff --git a/gulpfile.js b/gulpfile.js
index e34bf64b18c..4878028e121 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -114,9 +114,9 @@ gulp.task('watch-build', ['clean-build'], watchTask('out-build', true));
 gulp.task('default', ['compile']);
 
 // All
-gulp.task('clean', ['clean-client', 'clean-plugins']);
-gulp.task('compile', ['compile-client', 'compile-plugins']);
-gulp.task('watch', ['watch-client', 'watch-plugins']);
+gulp.task('clean', ['clean-client', 'clean-extensions']);
+gulp.task('compile', ['compile-client', 'compile-extensions']);
+gulp.task('watch', ['watch-client', 'watch-extensions']);
 
 gulp.task('test', function () {
 	return gulp.src('test/all.js')