diff --git a/src/vs/platform/extensions/node/pluginVersionValidator.ts b/src/vs/platform/extensions/node/extensionValidator.ts
similarity index 94%
rename from src/vs/platform/extensions/node/pluginVersionValidator.ts
rename to src/vs/platform/extensions/node/extensionValidator.ts
index 670333fba7c87d0098ca7f39c39d4fdaa4ba39a7..7c326fd2923c1521b2f37f4b9272781bce7a1799 100644
--- a/src/vs/platform/extensions/node/pluginVersionValidator.ts
+++ b/src/vs/platform/extensions/node/extensionValidator.ts
@@ -6,7 +6,7 @@
 
 import * as nls from 'vs/nls';
 import {IExtensionDescription} from 'vs/platform/extensions/common/extensions';
-import {isValidExtensionDescription as baseIsValidPluginDescription} from 'vs/platform/extensions/common/extensionsRegistry';
+import {isValidExtensionDescription as baseIsValidExtensionDescription} from 'vs/platform/extensions/common/extensionsRegistry';
 import {valid} from 'semver';
 
 export interface IParsedVersion {
@@ -203,9 +203,9 @@ export function isValidExtensionVersion(version: string, extensionDesc: IReduced
 	return true;
 }
 
-export function isValidPluginDescription(version: string, extensionFolderPath: string, extensionDescription: IExtensionDescription, notices: string[]): boolean {
+export function isValidExtensionDescription(version: string, extensionFolderPath: string, extensionDescription: IExtensionDescription, notices: string[]): boolean {
 
-	if (!baseIsValidPluginDescription(extensionFolderPath, extensionDescription, notices)) {
+	if (!baseIsValidExtensionDescription(extensionFolderPath, extensionDescription, notices)) {
 		return false;
 	}
 
diff --git a/src/vs/platform/extensions/test/node/pluginVersionValidator.test.ts b/src/vs/platform/extensions/test/node/extensionValidator.test.ts
similarity index 99%
rename from src/vs/platform/extensions/test/node/pluginVersionValidator.test.ts
rename to src/vs/platform/extensions/test/node/extensionValidator.test.ts
index 11add19b4e3767f349f604ec9394b1f548416f88..59180d2ba66c62c16669156edabdacfddc4daac7 100644
--- a/src/vs/platform/extensions/test/node/pluginVersionValidator.test.ts
+++ b/src/vs/platform/extensions/test/node/extensionValidator.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import {INormalizedVersion, IParsedVersion, IReducedExtensionDescription, isValidExtensionVersion, isValidVersion, isValidVersionStr, normalizeVersion, parseVersion} from 'vs/platform/extensions/node/pluginVersionValidator';
+import {INormalizedVersion, IParsedVersion, IReducedExtensionDescription, isValidExtensionVersion, isValidVersion, isValidVersionStr, normalizeVersion, parseVersion} from 'vs/platform/extensions/node/extensionValidator';
 
 suite('Plugin Version Validator', () => {
 
diff --git a/src/vs/workbench/node/extensionPoints.ts b/src/vs/workbench/node/extensionPoints.ts
index 3873103ca8defa4d0df0b5a8898d0297d578d705..fe3b0832ba3bbd55a5fa1f101d5983e78b86ba13 100644
--- a/src/vs/workbench/node/extensionPoints.ts
+++ b/src/vs/workbench/node/extensionPoints.ts
@@ -13,7 +13,7 @@ import paths = require('vs/base/common/paths');
 import json = require('vs/base/common/json');
 import Types = require('vs/base/common/types');
 import {IExtensionsMessageCollector, IExtensionMessageCollector} from 'vs/platform/extensions/common/extensionsRegistry';
-import {isValidPluginDescription} from 'vs/platform/extensions/node/pluginVersionValidator';
+import {isValidExtensionDescription} from 'vs/platform/extensions/node/extensionValidator';
 import * as semver from 'semver';
 
 const MANIFEST_FILE = 'package.json';
@@ -159,7 +159,7 @@ export class PluginScanner {
 			pluginDescFromFile.isBuiltin = isBuiltin;
 
 			let notices: string[] = [];
-			if (!isValidPluginDescription(version, absoluteFolderPath, pluginDescFromFile, notices)) {
+			if (!isValidExtensionDescription(version, absoluteFolderPath, pluginDescFromFile, notices)) {
 				notices.forEach((error) => {
 					builder.error(error);
 				});
diff --git a/src/vs/workbench/parts/extensions/node/extensionsService.ts b/src/vs/workbench/parts/extensions/node/extensionsService.ts
index 2b2fac735a514d7a78660aed28ff8242ee9ec244..18a229d71a2dc2260b7f344103b694e978c16e18 100644
--- a/src/vs/workbench/parts/extensions/node/extensionsService.ts
+++ b/src/vs/workbench/parts/extensions/node/extensionsService.ts
@@ -24,7 +24,7 @@ import Event, { Emitter } from 'vs/base/common/event';
 import { UserSettings } from 'vs/workbench/node/userSettings';
 import * as semver from 'semver';
 import { groupBy, values } from 'vs/base/common/collections';
-import { isValidExtensionVersion } from 'vs/platform/extensions/node/pluginVersionValidator';
+import { isValidExtensionVersion } from 'vs/platform/extensions/node/extensionValidator';
 
 function parseManifest(raw: string): TPromise<IExtensionManifest> {
 	return new Promise((c, e) => {