diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index f10d6f271b9..6be0bb349cf 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -35,7 +35,7 @@ import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
 import { IWorkspaceSymbol } from 'vs/workbench/parts/search/common/search';
 import { IApplyEditsOptions, TextEditorRevealType, ITextEditorConfigurationUpdate, IResolvedTextEditorConfiguration, ISelectionChangeEvent } from './mainThreadEditorsTracker';
 
-import { InternalTreeExplorerNode } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
+import { InternalTreeExplorerNodeContent } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
 
 export interface IEnvironment {
 	appSettingsHome: string;
@@ -287,9 +287,9 @@ export abstract class ExtHostEditorsShape {
 }
 
 export abstract class ExtHostTreeExplorersShape {
-	$provideRootNode(providerId: string): TPromise<InternalTreeExplorerNode> { throw ni(); };
-	$resolveChildren(providerId: string, node: InternalTreeExplorerNode): TPromise<InternalTreeExplorerNode[]> { throw ni(); }
-	$getInternalCommand(providerId: string, node: InternalTreeExplorerNode): TPromise<modes.Command> { throw ni(); }
+	$provideRootNode(providerId: string): TPromise<InternalTreeExplorerNodeContent> { throw ni(); };
+	$resolveChildren(providerId: string, node: InternalTreeExplorerNodeContent): TPromise<InternalTreeExplorerNodeContent[]> { throw ni(); }
+	$getInternalCommand(providerId: string, node: InternalTreeExplorerNodeContent): TPromise<modes.Command> { throw ni(); }
 }
 
 export abstract class ExtHostExtensionServiceShape {
diff --git a/src/vs/workbench/api/node/mainThreadTreeExplorers.ts b/src/vs/workbench/api/node/mainThreadTreeExplorers.ts
index 985fa31c84a..27c4ea6ca01 100644
--- a/src/vs/workbench/api/node/mainThreadTreeExplorers.ts
+++ b/src/vs/workbench/api/node/mainThreadTreeExplorers.ts
@@ -8,7 +8,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 { InternalTreeExplorerNode } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
+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';
 
@@ -30,13 +30,13 @@ export class MainThreadTreeExplorers extends MainThreadTreeExplorersShape {
 		const onError = err => { this.messageService.show(Severity.Error, err); };
 
 		this.treeExplorerService.registerTreeExplorerNodeProvider(providerId, {
-			provideRootNode: (): TPromise<InternalTreeExplorerNode> => {
+			provideRootNode: (): TPromise<InternalTreeExplorerNodeContent> => {
 				return this._proxy.$provideRootNode(providerId).then(rootNode => rootNode, onError);
 			},
-			resolveChildren: (node: InternalTreeExplorerNode): TPromise<InternalTreeExplorerNode[]> => {
+			resolveChildren: (node: InternalTreeExplorerNodeContent): TPromise<InternalTreeExplorerNodeContent[]> => {
 				return this._proxy.$resolveChildren(providerId, node).then(children => children, onError);
 			},
-			executeCommand: (node: InternalTreeExplorerNode): TPromise<any> => {
+			executeCommand: (node: InternalTreeExplorerNodeContent): TPromise<any> => {
 				return this._proxy.$getInternalCommand(providerId, node).then(command => {
 					return this.commandService.executeCommand(command.id, ...command.arguments);
 				});
diff --git a/src/vs/workbench/parts/explorers/common/treeExplorerViewModel.ts b/src/vs/workbench/parts/explorers/common/treeExplorerViewModel.ts
index a61a951fef7..f82df34a574 100644
--- a/src/vs/workbench/parts/explorers/common/treeExplorerViewModel.ts
+++ b/src/vs/workbench/parts/explorers/common/treeExplorerViewModel.ts
@@ -7,7 +7,13 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { TreeExplorerNodeProvider } from 'vscode';
 
-export class InternalTreeExplorerNode implements TreeExplorerNodeContent {
+export interface InternalTreeExplorerNodeContent {
+	label: string;
+	hasChildren: boolean;
+	clickCommand: string;
+}
+
+export class InternalTreeExplorerNode implements InternalTreeExplorerNodeContent {
 	private static idCounter = 1;
 
 	id: number;
@@ -26,13 +32,7 @@ export class InternalTreeExplorerNode implements TreeExplorerNodeContent {
 }
 
 export interface InternalTreeExplorerNodeProvider {
-	provideRootNode(): Thenable<InternalTreeExplorerNode>;
-	resolveChildren(node: InternalTreeExplorerNode): Thenable<InternalTreeExplorerNode[]>;
-	executeCommand(node: TreeExplorerNodeContent): TPromise<any>;
-}
-
-export interface TreeExplorerNodeContent {
-	label: string;
-	hasChildren: boolean;
-	clickCommand: string;
+	provideRootNode(): Thenable<InternalTreeExplorerNodeContent>;
+	resolveChildren(node: InternalTreeExplorerNodeContent): Thenable<InternalTreeExplorerNodeContent[]>;
+	executeCommand(node: InternalTreeExplorerNodeContent): TPromise<any>;
 }