diff --git a/src/vs/editor/common/model/mirrorModel.ts b/src/vs/editor/common/model/mirrorTextModel.ts
similarity index 99%
rename from src/vs/editor/common/model/mirrorModel.ts
rename to src/vs/editor/common/model/mirrorTextModel.ts
index b29f7a6d163dd257a604b3ebb9c08351228457fc..7aa8eac991819ddde7735586460161e405f94e32 100644
--- a/src/vs/editor/common/model/mirrorModel.ts
+++ b/src/vs/editor/common/model/mirrorTextModel.ts
@@ -25,7 +25,7 @@ export interface IModelChangedEvent {
 	readonly versionId: number;
 }
 
-export class MirrorModel {
+export class MirrorTextModel {
 
 	protected _uri: URI;
 	protected _lines: string[];
diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts
index f4cfd9b64f4520e7f46ec1617103dc5a26088878..5322df6a35935e544f5a0daa01cb6561162006d3 100644
--- a/src/vs/editor/common/services/editorSimpleWorker.ts
+++ b/src/vs/editor/common/services/editorSimpleWorker.ts
@@ -14,7 +14,7 @@ import { DiffComputer } from 'vs/editor/common/diff/diffComputer';
 import { stringDiff } from 'vs/base/common/diff/diff';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { Position, IPosition } from 'vs/editor/common/core/position';
-import { MirrorModel as BaseMirrorModel, IModelChangedEvent } from 'vs/editor/common/model/mirrorModel';
+import { MirrorTextModel as BaseMirrorModel, IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
 import { IInplaceReplaceSupportResult, ILink, ISuggestResult, ISuggestion, TextEdit } from 'vs/editor/common/modes';
 import { computeLinks } from 'vs/editor/common/modes/linkComputer';
 import { BasicInplaceReplace } from 'vs/editor/common/modes/supports/inplaceReplaceSupport';
diff --git a/src/vs/editor/test/common/model/editableTextModel.test.ts b/src/vs/editor/test/common/model/editableTextModel.test.ts
index bfefb8427c358f5c497b36a5faf6e04e35230b03..28aa980c3e73e3bc9e466c93006700970f4e27a7 100644
--- a/src/vs/editor/test/common/model/editableTextModel.test.ts
+++ b/src/vs/editor/test/common/model/editableTextModel.test.ts
@@ -9,7 +9,7 @@ import * as assert from 'assert';
 import { Range } from 'vs/editor/common/core/range';
 import { EndOfLineSequence, IIdentifiedSingleEditOperation, DefaultEndOfLine } from 'vs/editor/common/model';
 import { TextModel } from 'vs/editor/common/model/textModel';
-import { MirrorModel } from 'vs/editor/common/model/mirrorModel';
+import { MirrorTextModel } from 'vs/editor/common/model/mirrorTextModel';
 import { assertSyncedModels, testApplyEditsWithSyncedModels } from 'vs/editor/test/common/model/editableTextModelTestUtils';
 import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvents';
 import { RawTextSource, TextSource } from 'vs/editor/common/model/textSource';
@@ -1552,7 +1552,7 @@ suite('EditorModel - EditableTextModel.applyEdits', () => {
 		let model = createEditableTextModelFromString('Hello\nWorld!');
 		assert.equal(model.getEOL(), '\n');
 
-		let mirrorModel2 = new MirrorModel(null, model.getLinesContent(), model.getEOL(), model.getVersionId());
+		let mirrorModel2 = new MirrorTextModel(null, model.getLinesContent(), model.getEOL(), model.getVersionId());
 		let mirrorModel2PrevVersionId = model.getVersionId();
 
 		model.onDidChangeContent((e: IModelContentChangedEvent) => {
diff --git a/src/vs/editor/test/common/model/editableTextModelTestUtils.ts b/src/vs/editor/test/common/model/editableTextModelTestUtils.ts
index 2bc4445ec2e4a083a4752f93214beb7d3404e338..030f52f54c585d0c49114126078c82d35523557f 100644
--- a/src/vs/editor/test/common/model/editableTextModelTestUtils.ts
+++ b/src/vs/editor/test/common/model/editableTextModelTestUtils.ts
@@ -6,7 +6,7 @@
 
 import * as assert from 'assert';
 import { TextModel } from 'vs/editor/common/model/textModel';
-import { MirrorModel } from 'vs/editor/common/model/mirrorModel';
+import { MirrorTextModel } from 'vs/editor/common/model/mirrorTextModel';
 import { Position } from 'vs/editor/common/core/position';
 import { RawTextSource } from 'vs/editor/common/model/textSource';
 import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvents';
@@ -90,7 +90,7 @@ export function assertSyncedModels(text: string, callback: (model: TextModel, as
 		assertLineMapping(model, 'model');
 	}
 
-	var mirrorModel2 = new MirrorModel(null, model.getLinesContent(), model.getEOL(), model.getVersionId());
+	var mirrorModel2 = new MirrorTextModel(null, model.getLinesContent(), model.getEOL(), model.getVersionId());
 	var mirrorModel2PrevVersionId = model.getVersionId();
 
 	model.onDidChangeContent((e: IModelContentChangedEvent) => {
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 38fe085635aa7df3defa1e130b85fe3ac142b6a8..b38936b9694631110a1b54149ecc6f847ceafbec 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -40,7 +40,7 @@ import { EndOfLine, TextEditorLineNumbersStyle } from 'vs/workbench/api/node/ext
 
 
 import { TaskSet } from 'vs/workbench/parts/tasks/common/tasks';
-import { IModelChangedEvent } from 'vs/editor/common/model/mirrorModel';
+import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
 import { IPosition } from 'vs/editor/common/core/position';
 import { IRange } from 'vs/editor/common/core/range';
 import { ISelection, Selection } from 'vs/editor/common/core/selection';
diff --git a/src/vs/workbench/api/node/extHostDocumentData.ts b/src/vs/workbench/api/node/extHostDocumentData.ts
index 39767d01a6dd04aa976fd2f1822d1afc20334f17..3b4ec0937ca192e2215503b5986a9ddb28481721 100644
--- a/src/vs/workbench/api/node/extHostDocumentData.ts
+++ b/src/vs/workbench/api/node/extHostDocumentData.ts
@@ -6,7 +6,7 @@
 
 import { ok } from 'vs/base/common/assert';
 import { regExpLeadsToEndlessLoop } from 'vs/base/common/strings';
-import { MirrorModel } from 'vs/editor/common/model/mirrorModel';
+import { MirrorTextModel } from 'vs/editor/common/model/mirrorTextModel';
 import URI from 'vs/base/common/uri';
 import { Range, Position, EndOfLine } from 'vs/workbench/api/node/extHostTypes';
 import * as vscode from 'vscode';
@@ -23,7 +23,7 @@ export function getWordDefinitionFor(modeId: string): RegExp {
 	return _modeId2WordDefinition.get(modeId);
 }
 
-export class ExtHostDocumentData extends MirrorModel {
+export class ExtHostDocumentData extends MirrorTextModel {
 
 	private _proxy: MainThreadDocumentsShape;
 	private _languageId: string;
diff --git a/src/vs/workbench/api/node/extHostDocuments.ts b/src/vs/workbench/api/node/extHostDocuments.ts
index a8a9773b3c2fd487f57e6d2e20ab5bec86a3b680..c92d98c77212b8a196ae514f4735ca830d47132a 100644
--- a/src/vs/workbench/api/node/extHostDocuments.ts
+++ b/src/vs/workbench/api/node/extHostDocuments.ts
@@ -13,7 +13,7 @@ import * as vscode from 'vscode';
 import { MainContext, MainThreadDocumentsShape, ExtHostDocumentsShape, IMainContext } from './extHost.protocol';
 import { ExtHostDocumentData, setWordDefinitionFor } from './extHostDocumentData';
 import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors';
-import { IModelChangedEvent } from 'vs/editor/common/model/mirrorModel';
+import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
 
 export class ExtHostDocuments implements ExtHostDocumentsShape {
 
diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
index b89cbfe82dd8d6b580ca460e88a474128f02e15d..f808f44c17f06c726cf7532003708fded21aaf39 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
@@ -12,7 +12,7 @@ import { Position } from 'vs/workbench/api/node/extHostTypes';
 import { Range } from 'vs/editor/common/core/range';
 import { MainThreadDocumentsShape } from 'vs/workbench/api/node/extHost.protocol';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IModelChangedEvent } from 'vs/editor/common/model/mirrorModel';
+import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
 import { mock } from 'vs/workbench/test/electron-browser/api/mock';