diff --git a/src/vs/workbench/api/node/mainThreadTreeExplorers.ts b/src/vs/workbench/api/node/mainThreadTreeExplorers.ts
index 27c4ea6ca01..7095b535668 100644
--- a/src/vs/workbench/api/node/mainThreadTreeExplorers.ts
+++ b/src/vs/workbench/api/node/mainThreadTreeExplorers.ts
@@ -7,7 +7,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
 import { ExtHostContext, MainThreadTreeExplorersShape, ExtHostTreeExplorersShape } from './extHost.protocol';
-import { ITreeExplorerViewletService } from 'vs/workbench/parts/explorers/browser/treeExplorerViewletService';
+import { ICustomTreeExplorerService } from 'vs/workbench/parts/explorers/browser/customTreeExplorerService';
 import { InternalTreeExplorerNodeContent } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
 import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -17,7 +17,7 @@ export class MainThreadTreeExplorers extends MainThreadTreeExplorersShape {
 
 	constructor(
 		@IThreadService private threadService: IThreadService,
-		@ITreeExplorerViewletService private treeExplorerService: ITreeExplorerViewletService,
+		@ICustomTreeExplorerService private treeExplorerService: ICustomTreeExplorerService,
 		@IMessageService private messageService: IMessageService,
 		@ICommandService private commandService: ICommandService
 	) {
diff --git a/src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts b/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.ts
similarity index 92%
rename from src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts
rename to src/vs/workbench/parts/explorers/browser/customTreeExplorerService.ts
index 53b710d4752..b7e8194dc01 100644
--- a/src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts
+++ b/src/vs/workbench/parts/explorers/browser/customTreeExplorerService.ts
@@ -11,9 +11,9 @@ import { InternalTreeExplorerNode, InternalTreeExplorerNodeProvider } from 'vs/w
 import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import Event, { Emitter } from 'vs/base/common/event';
 
-export const ITreeExplorerViewletService = createDecorator<ITreeExplorerViewletService>('customViewletService');
+export const ICustomTreeExplorerService = createDecorator<ICustomTreeExplorerService>('customTreeExplorerService');
 
-export interface ITreeExplorerViewletService {
+export interface ICustomTreeExplorerService {
 	_serviceBrand: any;
 
 	onTreeExplorerNodeProviderRegistered: Event<String>;
@@ -26,7 +26,7 @@ export interface ITreeExplorerViewletService {
 	executeCommand(providerId: string, node: InternalTreeExplorerNode): TPromise<void>;
 }
 
-export class TreeExplorerViewletService implements ITreeExplorerViewletService {
+export class CustomTreeExplorerService implements ICustomTreeExplorerService {
 	public _serviceBrand: any;
 
 	private _onTreeExplorerNodeProviderRegistered = new Emitter<String>();
diff --git a/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.ts b/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.ts
index 7ac981d3419..bfbc7505902 100644
--- a/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.ts
+++ b/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.ts
@@ -12,7 +12,7 @@ import { createCSSRule } from 'vs/base/browser/dom';
 import { Registry } from 'vs/platform/platform';
 import { ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { ITreeExplorerViewletService, TreeExplorerViewletService } from 'vs/workbench/parts/explorers/browser/treeExplorerViewletService';
+import { ICustomTreeExplorerService, CustomTreeExplorerService } from 'vs/workbench/parts/explorers/browser/customTreeExplorerService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } from 'vs/workbench/browser/viewlet';
 import { ITreeExplorer } from 'vs/platform/extensionManagement/common/extensionManagement';
@@ -21,7 +21,7 @@ import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { IMessageService, Severity } from 'vs/platform/message/common/message';
 
-registerSingleton(ITreeExplorerViewletService, TreeExplorerViewletService);
+registerSingleton(ICustomTreeExplorerService, CustomTreeExplorerService);
 
 const explorerSchema: IJSONSchema = {
 	description: localize('vscode.extension.contributes.explorer', "Contributes custom tree explorer viewlet to the sidebar"),
diff --git a/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.ts b/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.ts
index 7baa88f1000..74c67832978 100644
--- a/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.ts
+++ b/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.ts
@@ -18,7 +18,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
-import { ITreeExplorerViewletService } from 'vs/workbench/parts/explorers/browser/treeExplorerViewletService';
+import { ICustomTreeExplorerService } from 'vs/workbench/parts/explorers/browser/customTreeExplorerService';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { TreeExplorerViewletState, TreeDataSource, TreeRenderer, TreeController } from 'vs/workbench/parts/explorers/browser/views/treeExplorerViewer';
@@ -39,7 +39,7 @@ export class TreeExplorerView extends CollapsibleViewletView {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
-		@ITreeExplorerViewletService private treeExplorerViewletService: ITreeExplorerViewletService
+		@ICustomTreeExplorerService private treeExplorerViewletService: ICustomTreeExplorerService
 	) {
 		super(actionRunner, false, nls.localize('treeExplorerViewletTree', "Tree Explorer Section"), messageService, keybindingService, contextMenuService, headerSize);
 
diff --git a/src/vs/workbench/parts/explorers/browser/views/treeExplorerViewer.ts b/src/vs/workbench/parts/explorers/browser/views/treeExplorerViewer.ts
index 345c470c1eb..ae13a5c041b 100644
--- a/src/vs/workbench/parts/explorers/browser/views/treeExplorerViewer.ts
+++ b/src/vs/workbench/parts/explorers/browser/views/treeExplorerViewer.ts
@@ -16,14 +16,14 @@ import { ContributableActionProvider } from 'vs/workbench/browser/actionBarRegis
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 import { IModeService } from 'vs/editor/common/services/modeService';
-import { ITreeExplorerViewletService } from 'vs/workbench/parts/explorers/browser/treeExplorerViewletService';
+import { ICustomTreeExplorerService } from 'vs/workbench/parts/explorers/browser/customTreeExplorerService';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 
 export class TreeDataSource implements IDataSource {
 
 	constructor(
 		private treeNodeProviderId: string,
-		@ITreeExplorerViewletService private treeExplorerViewletService: ITreeExplorerViewletService,
+		@ICustomTreeExplorerService private treeExplorerViewletService: ICustomTreeExplorerService,
 		@IProgressService private progressService: IProgressService
 	) {
 
@@ -89,7 +89,7 @@ export class TreeController extends DefaultController {
 
 	constructor(
 		private treeNodeProviderId: string,
-		@ITreeExplorerViewletService private treeExplorerViewletService: ITreeExplorerViewletService
+		@ICustomTreeExplorerService private treeExplorerViewletService: ICustomTreeExplorerService
 	) {
 		super({ clickBehavior: ClickBehavior.ON_MOUSE_UP /* do not change to not break DND */ });
 	}