diff --git a/extensions/typescript-language-features/src/extension.ts b/extensions/typescript-language-features/src/extension.ts
index 0d88075d570..10408a4a7cc 100644
--- a/extensions/typescript-language-features/src/extension.ts
+++ b/extensions/typescript-language-features/src/extension.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import * as commands from './commands';
 import { LanguageConfigurationManager } from './features/languageConfiguration';
-import TypeScriptTaskProviderManager from './features/taskProvider';
+import TypeScriptTaskProviderManager from './features/task';
 import TypeScriptServiceClientHost from './typeScriptServiceClientHost';
 import { CommandManager } from './utils/commandManager';
 import * as fileSchemes from './utils/fileSchemes';
diff --git a/extensions/typescript-language-features/src/features/completionItemProvider.ts b/extensions/typescript-language-features/src/features/completions.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/completionItemProvider.ts
rename to extensions/typescript-language-features/src/features/completions.ts
diff --git a/extensions/typescript-language-features/src/features/definitionProvider.ts b/extensions/typescript-language-features/src/features/definitions.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/definitionProvider.ts
rename to extensions/typescript-language-features/src/features/definitions.ts
diff --git a/extensions/typescript-language-features/src/features/directiveCommentCompletionProvider.ts b/extensions/typescript-language-features/src/features/directiveCommentCompletions.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/directiveCommentCompletionProvider.ts
rename to extensions/typescript-language-features/src/features/directiveCommentCompletions.ts
diff --git a/extensions/typescript-language-features/src/features/documentHighlightProvider.ts b/extensions/typescript-language-features/src/features/documentHighlight.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/documentHighlightProvider.ts
rename to extensions/typescript-language-features/src/features/documentHighlight.ts
diff --git a/extensions/typescript-language-features/src/features/documentSymbolProvider.ts b/extensions/typescript-language-features/src/features/documentSymbol.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/documentSymbolProvider.ts
rename to extensions/typescript-language-features/src/features/documentSymbol.ts
diff --git a/extensions/typescript-language-features/src/features/foldingProvider.ts b/extensions/typescript-language-features/src/features/folding.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/foldingProvider.ts
rename to extensions/typescript-language-features/src/features/folding.ts
diff --git a/extensions/typescript-language-features/src/features/formattingProvider.ts b/extensions/typescript-language-features/src/features/formatting.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/formattingProvider.ts
rename to extensions/typescript-language-features/src/features/formatting.ts
diff --git a/extensions/typescript-language-features/src/features/hoverProvider.ts b/extensions/typescript-language-features/src/features/hover.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/hoverProvider.ts
rename to extensions/typescript-language-features/src/features/hover.ts
diff --git a/extensions/typescript-language-features/src/features/implementationProvider.ts b/extensions/typescript-language-features/src/features/implementations.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/implementationProvider.ts
rename to extensions/typescript-language-features/src/features/implementations.ts
diff --git a/extensions/typescript-language-features/src/features/implementationsCodeLensProvider.ts b/extensions/typescript-language-features/src/features/implementationsCodeLens.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/implementationsCodeLensProvider.ts
rename to extensions/typescript-language-features/src/features/implementationsCodeLens.ts
diff --git a/extensions/typescript-language-features/src/features/jsDocCompletionProvider.ts b/extensions/typescript-language-features/src/features/jsDocCompletions.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/jsDocCompletionProvider.ts
rename to extensions/typescript-language-features/src/features/jsDocCompletions.ts
diff --git a/extensions/typescript-language-features/src/features/quickFixProvider.ts b/extensions/typescript-language-features/src/features/quickFix.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/quickFixProvider.ts
rename to extensions/typescript-language-features/src/features/quickFix.ts
diff --git a/extensions/typescript-language-features/src/features/refactorProvider.ts b/extensions/typescript-language-features/src/features/refactor.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/refactorProvider.ts
rename to extensions/typescript-language-features/src/features/refactor.ts
diff --git a/extensions/typescript-language-features/src/features/referenceProvider.ts b/extensions/typescript-language-features/src/features/references.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/referenceProvider.ts
rename to extensions/typescript-language-features/src/features/references.ts
diff --git a/extensions/typescript-language-features/src/features/referencesCodeLensProvider.ts b/extensions/typescript-language-features/src/features/referencesCodeLens.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/referencesCodeLensProvider.ts
rename to extensions/typescript-language-features/src/features/referencesCodeLens.ts
diff --git a/extensions/typescript-language-features/src/features/renameProvider.ts b/extensions/typescript-language-features/src/features/rename.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/renameProvider.ts
rename to extensions/typescript-language-features/src/features/rename.ts
diff --git a/extensions/typescript-language-features/src/features/signatureHelpProvider.ts b/extensions/typescript-language-features/src/features/signatureHelp.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/signatureHelpProvider.ts
rename to extensions/typescript-language-features/src/features/signatureHelp.ts
diff --git a/extensions/typescript-language-features/src/features/taskProvider.ts b/extensions/typescript-language-features/src/features/task.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/taskProvider.ts
rename to extensions/typescript-language-features/src/features/task.ts
diff --git a/extensions/typescript-language-features/src/features/typeDefinitionProvider.ts b/extensions/typescript-language-features/src/features/typeDefinitions.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/typeDefinitionProvider.ts
rename to extensions/typescript-language-features/src/features/typeDefinitions.ts
diff --git a/extensions/typescript-language-features/src/features/workspaceSymbolProvider.ts b/extensions/typescript-language-features/src/features/workspaceSymbols.ts
similarity index 100%
rename from extensions/typescript-language-features/src/features/workspaceSymbolProvider.ts
rename to extensions/typescript-language-features/src/features/workspaceSymbols.ts
diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts
index aef07805f0e..d1368d56b95 100644
--- a/extensions/typescript-language-features/src/languageProvider.ts
+++ b/extensions/typescript-language-features/src/languageProvider.ts
@@ -100,26 +100,26 @@ export default class LanguageProvider {
 
 		const cachedResponse = new CachedNavTreeResponse();
 
-		this.disposables.push((await import('./features/completionItemProvider')).register(selector, client, typingsStatus, this.fileConfigurationManager, commandManager));
-		this.disposables.push((await import('./features/definitionProvider')).register(selector, client));
-		this.disposables.push((await import('./features/directiveCommentCompletionProvider')).register(selector, client));
-		this.disposables.push((await import('./features/documentHighlightProvider')).register(selector, client));
-		this.disposables.push((await import('./features/documentSymbolProvider')).register(selector, client));
-		this.disposables.push((await import('./features/foldingProvider')).register(selector, client));
-		this.disposables.push((await import('./features/formattingProvider')).register(selector, this.description.id, config, client, this.fileConfigurationManager));
-		this.disposables.push((await import('./features/hoverProvider')).register(selector, client));
-		this.disposables.push((await import('./features/implementationProvider')).register(selector, client));
-		this.disposables.push((await import('./features/implementationsCodeLensProvider')).register(selector, this.description.id, client, cachedResponse));
-		this.disposables.push((await import('./features/jsDocCompletionProvider')).register(selector, client, commandManager));
+		this.disposables.push((await import('./features/completions')).register(selector, client, typingsStatus, this.fileConfigurationManager, commandManager));
+		this.disposables.push((await import('./features/definitions')).register(selector, client));
+		this.disposables.push((await import('./features/directiveCommentCompletions')).register(selector, client));
+		this.disposables.push((await import('./features/documentHighlight')).register(selector, client));
+		this.disposables.push((await import('./features/documentSymbol')).register(selector, client));
+		this.disposables.push((await import('./features/folding')).register(selector, client));
+		this.disposables.push((await import('./features/formatting')).register(selector, this.description.id, config, client, this.fileConfigurationManager));
+		this.disposables.push((await import('./features/hover')).register(selector, client));
+		this.disposables.push((await import('./features/implementations')).register(selector, client));
+		this.disposables.push((await import('./features/implementationsCodeLens')).register(selector, this.description.id, client, cachedResponse));
+		this.disposables.push((await import('./features/jsDocCompletions')).register(selector, client, commandManager));
 		this.disposables.push((await import('./features/organizeImports')).register(selector, client, this.commandManager, this.fileConfigurationManager));
-		this.disposables.push((await import('./features/quickFixProvider')).register(selector, client, this.fileConfigurationManager, commandManager, this.diagnosticsManager, this.bufferSyncSupport, this.telemetryReporter));
-		this.disposables.push((await import('./features/refactorProvider')).register(selector, client, this.fileConfigurationManager, commandManager));
-		this.disposables.push((await import('./features/referenceProvider')).register(selector, client));
-		this.disposables.push((await import('./features/referencesCodeLensProvider')).register(selector, this.description.id, client, cachedResponse));
-		this.disposables.push((await import('./features/renameProvider')).register(selector, client));
-		this.disposables.push((await import('./features/signatureHelpProvider')).register(selector, client));
-		this.disposables.push((await import('./features/typeDefinitionProvider')).register(selector, client));
-		this.disposables.push((await import('./features/workspaceSymbolProvider')).register(client, this.description.modeIds));
+		this.disposables.push((await import('./features/quickFix')).register(selector, client, this.fileConfigurationManager, commandManager, this.diagnosticsManager, this.bufferSyncSupport, this.telemetryReporter));
+		this.disposables.push((await import('./features/refactor')).register(selector, client, this.fileConfigurationManager, commandManager));
+		this.disposables.push((await import('./features/references')).register(selector, client));
+		this.disposables.push((await import('./features/referencesCodeLens')).register(selector, this.description.id, client, cachedResponse));
+		this.disposables.push((await import('./features/rename')).register(selector, client));
+		this.disposables.push((await import('./features/signatureHelp')).register(selector, client));
+		this.disposables.push((await import('./features/typeDefinitions')).register(selector, client));
+		this.disposables.push((await import('./features/workspaceSymbols')).register(client, this.description.modeIds));
 	}
 
 	private configurationChanged(): void {
diff --git a/extensions/typescript-language-features/src/test/jsdocSnippet.test.ts b/extensions/typescript-language-features/src/test/jsdocSnippet.test.ts
index e2643ab1305..2f796161c76 100644
--- a/extensions/typescript-language-features/src/test/jsdocSnippet.test.ts
+++ b/extensions/typescript-language-features/src/test/jsdocSnippet.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import 'mocha';
-import { templateToSnippet } from '../features/jsDocCompletionProvider';
+import { templateToSnippet } from '../features/jsDocCompletions';
 
 suite('typescript.jsDocSnippet', () => {
 	test('Should do nothing for single line input', async () => {