diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index 01b92a4b7e2..e9b7ab4b8eb 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -34,7 +34,7 @@ import { IEditorGroupsAccessor, IEditorGroupView, fillActiveEditorViewState, Edi
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IAction } from 'vs/base/common/actions';
-import { NoTabsTitleControl } from 'vs/workbench/browser/parts/editor/noTabsTitleControl';
+import { SingleEditorTabsControl } from 'vs/workbench/browser/parts/editor/singleEditorTabsControl';
 import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
@@ -470,7 +470,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		if (this.accessor.partOptions.showTabs) {
 			this.titleAreaControl = this.scopedInstantiationService.createInstance(TabsTitleControl, this.titleContainer, this.accessor, this);
 		} else {
-			this.titleAreaControl = this.scopedInstantiationService.createInstance(NoTabsTitleControl, this.titleContainer, this.accessor, this);
+			this.titleAreaControl = this.scopedInstantiationService.createInstance(SingleEditorTabsControl, this.titleContainer, this.accessor, this);
 		}
 
 		return this.titleAreaControl;
diff --git a/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/singleeditortabscontrol.css
similarity index 100%
rename from src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css
rename to src/vs/workbench/browser/parts/editor/media/singleeditortabscontrol.css
diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
similarity index 98%
rename from src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
rename to src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
index 460698f6749..e57193efeae 100644
--- a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/notabstitlecontrol';
+import 'vs/css!./media/singleeditortabscontrol';
 import { EditorResourceAccessor, Verbosity, IEditorPartOptions, SideBySideEditor, preventEditorClose, EditorCloseMethod } from 'vs/workbench/common/editor';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { TitleControl, IToolbarActions, ITitleControlDimensions } from 'vs/workbench/browser/parts/editor/titleControl';
@@ -24,7 +24,7 @@ interface IRenderedEditorLabel {
 	pinned: boolean;
 }
 
-export class NoTabsTitleControl extends TitleControl {
+export class SingleEditorTabsControl extends TitleControl {
 
 	private titleContainer: HTMLElement | undefined;
 	private editorLabel: IResourceLabel | undefined;
@@ -36,7 +36,7 @@ export class NoTabsTitleControl extends TitleControl {
 		const titleContainer = this.titleContainer = parent;
 		titleContainer.draggable = true;
 
-		//Container listeners
+		// Container listeners
 		this.registerContainerListeners(titleContainer);
 
 		// Gesture Support