diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 3962a904105..dd95cebbc0d 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -3818,7 +3818,7 @@ declare module 'vscode' {
 		 * for custom tree explorers.
 		 *
 		 * @param providerId A unique id that identifies the provider.
-		 * @param provider A [TreeContentProvider](#TreeContentProvider)
+		 * @param provider A [TreeExplorerNodeProvider](#TreeExplorerNodeProvider)
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
 		 */
 		export function registerTreeExplorerNodeProvider(providerId: string, provider: TreeExplorerNodeProvider<any>): Disposable;
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index ba5043d3146..002c2feb846 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -335,7 +335,7 @@ export function createApiFactory(threadService: IThreadService, extensionService
 				return extHostDocumentSaveParticipant.onWillSaveTextDocumentEvent(listener, thisArgs, disposables);
 			},
 			registerTreeExplorerNodeProvider(providerId: string, provider: vscode.TreeExplorerNodeProvider<any>) {
-				return extHostExplorers.registerTreeContentProvider(providerId, provider);
+				return extHostExplorers.registerTreeExplorerNodeProvider(providerId, provider);
 			},
 			onDidChangeConfiguration: (listener: () => any, thisArgs?: any, disposables?: extHostTypes.Disposable[]) => {
 				return extHostConfiguration.onDidChangeConfiguration(listener, thisArgs, disposables);
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index fd2e4b519ab..5e3415d42cb 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -118,8 +118,8 @@ export abstract class MainThreadEditorsShape {
 }
 
 export abstract class MainThreadTreeExplorersShape {
-	$registerTreeContentProvider(treeContentProviderId: string): void { throw ni(); }
-	$unregisterTreeContentProvider(treeContentProviderId: string): void { throw ni(); }
+	$registerTreeExplorerNodeProvider(providerId: string): void { throw ni(); }
+	$unregisterTreeExplorerNodeProvider(providerId: string): void { throw ni(); }
 }
 
 export abstract class MainThreadErrorsShape {
@@ -365,7 +365,7 @@ export const ExtHostContext = {
 	ExtHostDocuments: createExtId<ExtHostDocumentsShape>('ExtHostDocuments', ExtHostDocumentsShape),
 	ExtHostDocumentSaveParticipant: createExtId<ExtHostDocumentSaveParticipantShape>('ExtHostDocumentSaveParticipant', ExtHostDocumentSaveParticipantShape),
 	ExtHostEditors: createExtId<ExtHostEditorsShape>('ExtHostEditors', ExtHostEditorsShape),
-	ExtHostExplorers: createExtId<ExtHostTreeExplorersShape>('ExtHostExplorers',ExtHostTreeExplorersShape),
+	ExtHostExplorers: createExtId<ExtHostTreeExplorersShape>('ExtHostExplorers', ExtHostTreeExplorersShape),
 	ExtHostFileSystemEventService: createExtId<ExtHostFileSystemEventServiceShape>('ExtHostFileSystemEventService', ExtHostFileSystemEventServiceShape),
 	ExtHostHeapService: createExtId<ExtHostHeapServiceShape>('ExtHostHeapMonitor', ExtHostHeapServiceShape),
 	ExtHostLanguageFeatures: createExtId<ExtHostLanguageFeaturesShape>('ExtHostLanguageFeatures', ExtHostLanguageFeaturesShape),
diff --git a/src/vs/workbench/api/node/extHostTreeExplorers.ts b/src/vs/workbench/api/node/extHostTreeExplorers.ts
index e70900db733..869cf0ddf16 100644
--- a/src/vs/workbench/api/node/extHostTreeExplorers.ts
+++ b/src/vs/workbench/api/node/extHostTreeExplorers.ts
@@ -31,13 +31,13 @@ export class ExtHostTreeExplorers extends ExtHostTreeExplorersShape {
 		this._externalNodeMaps = Object.create(null);
 	}
 
-	registerTreeContentProvider(providerId: string, provider: TreeExplorerNodeProvider<any>): Disposable {
-		this._proxy.$registerTreeContentProvider(providerId);
+	registerTreeExplorerNodeProvider(providerId: string, provider: TreeExplorerNodeProvider<any>): Disposable {
+		this._proxy.$registerTreeExplorerNodeProvider(providerId);
 		this._treeExplorerNodeProviders[providerId] = provider;
 
 		return new Disposable(() => {
 			if (delete this._treeExplorerNodeProviders[providerId]) {
-				this._proxy.$unregisterTreeContentProvider(providerId);
+				this._proxy.$unregisterTreeExplorerNodeProvider(providerId);
 			}
 		});
 	}
diff --git a/src/vs/workbench/api/node/mainThreadTreeExplorers.ts b/src/vs/workbench/api/node/mainThreadTreeExplorers.ts
index a2de571cbbd..4c4b37d61fe 100644
--- a/src/vs/workbench/api/node/mainThreadTreeExplorers.ts
+++ b/src/vs/workbench/api/node/mainThreadTreeExplorers.ts
@@ -13,8 +13,6 @@ import { InternalTreeExplorerNode } from 'vs/workbench/parts/explorers/common/tr
 export class MainThreadTreeExplorers extends MainThreadTreeExplorersShape {
 	private _proxy: ExtHostTreeExplorersShape;
 
-	private _treeContents: { [treeContentProviderId: string]: InternalTreeExplorerNode };
-
 	constructor(
 		@IThreadService threadService: IThreadService,
 		@ITreeExplorerViewletService private treeExplorerService: ITreeExplorerViewletService
@@ -22,16 +20,12 @@ export class MainThreadTreeExplorers extends MainThreadTreeExplorersShape {
 		super();
 
 		this._proxy = threadService.get(ExtHostContext.ExtHostExplorers);
-		this._treeContents = Object.create(null);
 	}
 
-	$registerTreeContentProvider(providerId: string): void {
-		this.treeExplorerService.registerTreeContentProvider(providerId, {
+	$registerTreeExplorerNodeProvider(providerId: string): void {
+		this.treeExplorerService.registerTreeExplorerNodeProvider(providerId, {
 			provideRootNode: (): TPromise<InternalTreeExplorerNode> => {
-				return this._proxy.$provideRootNode(providerId).then(treeContent => {
-					this._treeContents[providerId] = treeContent;
-					return treeContent;
-				});
+				return this._proxy.$provideRootNode(providerId);
 			},
 			resolveChildren: (node: InternalTreeExplorerNode): TPromise<InternalTreeExplorerNode[]> => {
 				return this._proxy.$resolveChildren(providerId, node);
@@ -42,7 +36,7 @@ export class MainThreadTreeExplorers extends MainThreadTreeExplorersShape {
 		});
 	}
 
-	$unregisterTreeContentProvider(treeContentProviderId: string): void {
+	$unregisterTreeExplorerNodeProvider(providerId: string): void {
 
 	}
 }
diff --git a/src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts b/src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts
index 33827b60785..2946bd3d38b 100644
--- a/src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts
+++ b/src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts
@@ -13,7 +13,7 @@ export const ITreeExplorerViewletService = createDecorator<ITreeExplorerViewletS
 export interface ITreeExplorerViewletService {
 	_serviceBrand: any;
 
-	registerTreeContentProvider(providerId: string, provider: InternalTreeExplorerNodeProvider): void;
+	registerTreeExplorerNodeProvider(providerId: string, provider: InternalTreeExplorerNodeProvider): void;
 	provideTreeContent(providerId: string): TPromise<InternalTreeExplorerNode>;
 	resolveChildren(providerId: string, node: InternalTreeExplorerNode): TPromise<InternalTreeExplorerNode[]>;
 	resolveCommand(providerId: string, node: InternalTreeExplorerNode): TPromise<void>;
@@ -22,27 +22,27 @@ export interface ITreeExplorerViewletService {
 export class TreeExplorerViewletService implements ITreeExplorerViewletService {
 	public _serviceBrand: any;
 
-	private _treeContentProviders: { [providerId: string]: InternalTreeExplorerNodeProvider };
+	private _treeExplorerNodeProvider: { [providerId: string]: InternalTreeExplorerNodeProvider };
 
 	constructor(
 		@IInstantiationService private _instantiationService: IInstantiationService
 	) {
-		this._treeContentProviders = Object.create(null);
+		this._treeExplorerNodeProvider = Object.create(null);
 	}
 
-	registerTreeContentProvider(providerId: string, provider: InternalTreeExplorerNodeProvider): void {
-		this._treeContentProviders[providerId] = provider;
+	registerTreeExplorerNodeProvider(providerId: string, provider: InternalTreeExplorerNodeProvider): void {
+		this._treeExplorerNodeProvider[providerId] = provider;
 	}
 
 	provideTreeContent(providerId: string): TPromise<InternalTreeExplorerNode> {
-		return TPromise.wrap(this._treeContentProviders[providerId].provideRootNode());
+		return TPromise.wrap(this._treeExplorerNodeProvider[providerId].provideRootNode());
 	}
 
 	resolveChildren(providerId: string, node: InternalTreeExplorerNode): TPromise<InternalTreeExplorerNode[]> {
-		return TPromise.wrap(this._treeContentProviders[providerId].resolveChildren(node));
+		return TPromise.wrap(this._treeExplorerNodeProvider[providerId].resolveChildren(node));
 	}
 
 	resolveCommand(providerId: string, node: InternalTreeExplorerNode): TPromise<void> {
-		return TPromise.wrap(this._treeContentProviders[providerId].resolveCommand(node));
+		return TPromise.wrap(this._treeExplorerNodeProvider[providerId].resolveCommand(node));
 	}
 }