diff --git a/src/vs/workbench/api/browser/pluginHost.api.impl.ts b/src/vs/workbench/api/browser/pluginHost.api.impl.ts
index 413aefa5f35ca9a5878c663b88a3f81da069b41c..e7fc54e1cb152d88dbf5c55591a1adbe5ddc5d02 100644
--- a/src/vs/workbench/api/browser/pluginHost.api.impl.ts
+++ b/src/vs/workbench/api/browser/pluginHost.api.impl.ts
@@ -22,7 +22,7 @@ import {PluginHostTelemetryService} from 'vs/workbench/api/common/pluginHostTele
 import {PluginHostEditors} from 'vs/workbench/api/common/pluginHostEditors';
 import {ExtHostLanguages} from 'vs/workbench/api/common/extHostLanguages';
 import {ExtHostLanguageFeatures} from 'vs/workbench/api/common/extHostLanguageFeatures';
-import {ExtHostLanguageFeatureCommands} from 'vs/workbench/api/common/extHostLanguageFeatureCommands';
+import {ExtHostApiCommands} from 'vs/workbench/api/common/extHostApiCommands';
 import * as extHostTypes from 'vs/workbench/api/common/pluginHostTypes';
 import 'vs/workbench/api/common/pluginHostTypes.marshalling';
 import {wrapAsWinJSPromise} from 'vs/base/common/async';
@@ -267,7 +267,7 @@ export class PluginHostAPIImplementation {
 		const languages = new ExtHostLanguages(this._threadService);
 		const pluginHostDiagnostics = new PluginHostDiagnostics(this._threadService);
 		const languageFeatures = threadService.getRemotable(ExtHostLanguageFeatures);
-		const languageFeatureCommand = new ExtHostLanguageFeatureCommands(threadService.getRemotable(PluginHostCommands));
+		const languageFeatureCommand = new ExtHostApiCommands(threadService.getRemotable(PluginHostCommands));
 
 		this.languages = {
 			createDiagnosticCollection(name?: string): vscode.DiagnosticCollection {
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatureCommands.ts b/src/vs/workbench/api/common/extHostApiCommands.ts
similarity index 99%
rename from src/vs/workbench/api/common/extHostLanguageFeatureCommands.ts
rename to src/vs/workbench/api/common/extHostApiCommands.ts
index 3fb2cc79fa6f98a111a47d8fa71601c216608316..cadc2917d8363a248b5b4a37e7211901a594e687 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatureCommands.ts
+++ b/src/vs/workbench/api/common/extHostApiCommands.ts
@@ -37,7 +37,7 @@ import {RenameRegistry} from 'vs/editor/contrib/rename/common/rename';
 import {FormatRegistry, FormatOnTypeRegistry} from 'vs/editor/contrib/format/common/format';
 import {ICodeLensData} from 'vs/editor/contrib/codelens/common/codelens';
 
-export class ExtHostLanguageFeatureCommands {
+export class ExtHostApiCommands {
 
 	private _commands: PluginHostCommands;
 	private _disposables: IDisposable[] = [];
diff --git a/src/vs/workbench/test/common/api/extHostLanguageFeatureCommands.test.ts b/src/vs/workbench/test/common/api/extHostApiCommands.test.ts
similarity index 98%
rename from src/vs/workbench/test/common/api/extHostLanguageFeatureCommands.test.ts
rename to src/vs/workbench/test/common/api/extHostApiCommands.test.ts
index 22467d57f0c5d4062e35c998e3b7bfd5784b9826..0c1a16e4f24c833e60d98b8e9aa1f55fe483c778 100644
--- a/src/vs/workbench/test/common/api/extHostLanguageFeatureCommands.test.ts
+++ b/src/vs/workbench/test/common/api/extHostApiCommands.test.ts
@@ -24,7 +24,7 @@ import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingServic
 import {KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry';
 import {IModelService} from 'vs/editor/common/services/modelService';
 import {ExtHostLanguageFeatures, MainThreadLanguageFeatures} from 'vs/workbench/api/common/extHostLanguageFeatures';
-import {ExtHostLanguageFeatureCommands} from 'vs/workbench/api/common/extHostLanguageFeatureCommands';
+import {ExtHostApiCommands} from 'vs/workbench/api/common/extHostApiCommands';
 import {PluginHostCommands, MainThreadCommands} from 'vs/workbench/api/common/pluginHostCommands';
 import {PluginHostModelService} from 'vs/workbench/api/common/pluginHostDocuments';
 import {SyncDescriptor0} from 'vs/platform/instantiation/common/descriptors';
@@ -99,7 +99,7 @@ suite('ExtHostLanguageFeatureCommands', function() {
 
 		threadService.getRemotable(MainThreadCommands);
 		commands = threadService.getRemotable(PluginHostCommands);
-		new ExtHostLanguageFeatureCommands(commands);
+		new ExtHostApiCommands(commands);
 		mainThread = threadService.getRemotable(MainThreadLanguageFeatures);
 		extHost = threadService.getRemotable(ExtHostLanguageFeatures);
 	});