diff --git a/demo/editor.html b/demo/editor.html
index 1dc1bc8b..11e53d7f 100644
--- a/demo/editor.html
+++ b/demo/editor.html
@@ -53,7 +53,7 @@
 	<script src="../src/mode/XmlHighlightRules.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../src/MEventEmitter.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../src/Selection.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/TextDocument.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/Document.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../src/Tokenizer.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../src/BackgroundTokenizer.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../src/layer/Cursor.js" type="text/javascript" charset="utf-8"></script>	
@@ -140,11 +140,11 @@
 <script type="text/javascript" charset="utf-8">
 
 var docs = {}
-docs.js = new ace.TextDocument(document.getElementById("jstext").innerHTML);
+docs.js = new ace.Document(document.getElementById("jstext").innerHTML);
 docs.js.setMode(new ace.mode.JavaScript());
-docs.css = new ace.TextDocument(document.getElementById("csstext").innerHTML);
+docs.css = new ace.Document(document.getElementById("csstext").innerHTML);
 docs.css.setMode(new ace.mode.Css());
-docs.html = new ace.TextDocument(document.getElementById("htmltext").innerHTML);
+docs.html = new ace.Document(document.getElementById("htmltext").innerHTML);
 docs.html.setMode(new ace.mode.Html());
 
 var docEl = document.getElementById("doc");
diff --git a/src/TextDocument.js b/src/Document.js
similarity index 77%
rename from src/TextDocument.js
rename to src/Document.js
index 7c16330e..2a7855b3 100644
--- a/src/TextDocument.js
+++ b/src/Document.js
@@ -1,6 +1,6 @@
-ace.provide("ace.TextDocument");
+ace.provide("ace.Document");
 
-ace.TextDocument = function(text, mode) {
+ace.Document = function(text, mode) {
     this.$initEvents();
 
     this.lines = this._split(text);
@@ -13,21 +13,21 @@ ace.TextDocument = function(text, mode) {
     }
 };
 
-ace.mixin(ace.TextDocument.prototype, ace.MEventEmitter);
+ace.mixin(ace.Document.prototype, ace.MEventEmitter);
 
-ace.TextDocument.prototype._split = function(text) {
+ace.Document.prototype._split = function(text) {
     return text.split(/\r\n|\r|\n/);
 };
 
-ace.TextDocument.prototype.toString = function() {
+ace.Document.prototype.toString = function() {
     return this.lines.join("\n");
 };
 
-ace.TextDocument.prototype.getSelection = function() {
+ace.Document.prototype.getSelection = function() {
     return this.selection;
 };
 
-ace.TextDocument.prototype.fireChangeEvent = function(firstRow, lastRow) {
+ace.Document.prototype.fireChangeEvent = function(firstRow, lastRow) {
     var data = {
         firstRow: firstRow,
         lastRow: lastRow
@@ -35,52 +35,52 @@ ace.TextDocument.prototype.fireChangeEvent = function(firstRow, lastRow) {
     this.$dispatchEvent("change", { data: data});
 };
 
-ace.TextDocument.prototype.getTabString = function() {
+ace.Document.prototype.getTabString = function() {
     if (this.getUseSoftTabs()) {
         return new Array(this.getTabSize()+1).join(" ");
     }
     return "\t";
 };
 
-ace.TextDocument.prototype._useSoftTabs = true;
-ace.TextDocument.prototype.setUseSoftTabs = function(useSoftTabs) {
+ace.Document.prototype._useSoftTabs = true;
+ace.Document.prototype.setUseSoftTabs = function(useSoftTabs) {
     if (this._useSoftTabs === useSoftTabs) return;
 
     this._useSoftTabs = useSoftTabs;
 };
 
-ace.TextDocument.prototype.getUseSoftTabs = function() {
+ace.Document.prototype.getUseSoftTabs = function() {
     return this._useSoftTabs;
 };
 
-ace.TextDocument.prototype._tabSize = 4;
-ace.TextDocument.prototype.setTabSize = function(tabSize) {
+ace.Document.prototype._tabSize = 4;
+ace.Document.prototype.setTabSize = function(tabSize) {
     if (this._tabSize === tabSize) return;
 
     this._tabSize = tabSize;
     this.$dispatchEvent("changeTabSize");
 };
 
-ace.TextDocument.prototype.getTabSize = function() {
+ace.Document.prototype.getTabSize = function() {
     return this._tabSize;
 };
 
-ace.TextDocument.prototype._mode = null;
-ace.TextDocument.prototype.setMode = function(mode) {
+ace.Document.prototype._mode = null;
+ace.Document.prototype.setMode = function(mode) {
     if (this._mode === mode) return;
 
     this._mode = mode;
     this.$dispatchEvent("changeMode");
 };
 
-ace.TextDocument.prototype.getMode = function() {
+ace.Document.prototype.getMode = function() {
     if (!this._mode) {
         this._mode = new ace.mode.Text();
     }
     return this._mode;
 };
 
-ace.TextDocument.prototype.getWidth = function() {
+ace.Document.prototype.getWidth = function() {
     if (this.modified) {
         this.modified = false;
 
@@ -94,15 +94,15 @@ ace.TextDocument.prototype.getWidth = function() {
     return this.width;
 };
 
-ace.TextDocument.prototype.getLine = function(row) {
+ace.Document.prototype.getLine = function(row) {
     return this.lines[row] || "";
 };
 
-ace.TextDocument.prototype.getLength = function() {
+ace.Document.prototype.getLength = function() {
     return this.lines.length;
 };
 
-ace.TextDocument.prototype.getTextRange = function(range) {
+ace.Document.prototype.getTextRange = function(range) {
     if (range.start.row == range.end.row) {
         return this.lines[range.start.row].substring(range.start.column,
                                                      range.end.column);
@@ -116,11 +116,11 @@ ace.TextDocument.prototype.getTextRange = function(range) {
     }
 };
 
-ace.TextDocument.prototype.getLines = function(firstRow, lastRow) {
+ace.Document.prototype.getLines = function(firstRow, lastRow) {
     return this.lines.slice(firstRow, lastRow+1);
 };
 
-ace.TextDocument.prototype.findMatchingBracket = function(position) {
+ace.Document.prototype.findMatchingBracket = function(position) {
     if (position.column == 0) return null;
 
     var charBeforeCursor = this.getLine(position.row).charAt(position.column-1);
@@ -138,7 +138,7 @@ ace.TextDocument.prototype.findMatchingBracket = function(position) {
     }
 };
 
-ace.TextDocument.prototype._brackets = {
+ace.Document.prototype._brackets = {
     ")": "(",
     "(": ")",
     "]": "[",
@@ -147,7 +147,7 @@ ace.TextDocument.prototype._brackets = {
     "}": "{"
 };
 
-ace.TextDocument.prototype._findOpeningBracket = function(bracket, position) {
+ace.Document.prototype._findOpeningBracket = function(bracket, position) {
     var openBracket = this._brackets[bracket];
 
     var column = position.column - 2;
@@ -179,7 +179,7 @@ ace.TextDocument.prototype._findOpeningBracket = function(bracket, position) {
     return null;
 };
 
-ace.TextDocument.prototype._findClosingBracket = function(bracket, position) {
+ace.Document.prototype._findClosingBracket = function(bracket, position) {
     var closingBracket = this._brackets[bracket];
 
     var column = position.column;
@@ -212,20 +212,20 @@ ace.TextDocument.prototype._findClosingBracket = function(bracket, position) {
     return null;
 };
 
-ace.TextDocument.prototype.insert = function(position, text) {
+ace.Document.prototype.insert = function(position, text) {
     var end = this._insert(position, text);
     this.fireChangeEvent(position.row, position.row == end.row ? position.row
             : undefined);
     return end;
 };
 
-ace.TextDocument.prototype._insertLines = function(row, lines) {
+ace.Document.prototype._insertLines = function(row, lines) {
     var args = [row, 0];
     args.push.apply(args, lines);
     this.lines.splice.apply(this.lines, args);
 },
 
-ace.TextDocument.prototype._insert = function(position, text) {
+ace.Document.prototype._insert = function(position, text) {
     this.modified = true;
 
     var newLines = this._split(text);
@@ -269,11 +269,11 @@ ace.TextDocument.prototype._insert = function(position, text) {
     }
 };
 
-ace.TextDocument.prototype._isNewLine = function(text) {
+ace.Document.prototype._isNewLine = function(text) {
     return (text == "\r\n" || text == "\r" || text == "\n");
 };
 
-ace.TextDocument.prototype.remove = function(range) {
+ace.Document.prototype.remove = function(range) {
     this._remove(range);
 
     this.fireChangeEvent(range.start.row,
@@ -282,7 +282,7 @@ ace.TextDocument.prototype.remove = function(range) {
     return range.start;
 };
 
-ace.TextDocument.prototype._remove = function(range) {
+ace.Document.prototype._remove = function(range) {
     this.modified = true;
 
     var firstRow = range.start.row;
@@ -296,7 +296,7 @@ ace.TextDocument.prototype._remove = function(range) {
     return range.start;
 };
 
-ace.TextDocument.prototype.replace = function(range, text) {
+ace.Document.prototype.replace = function(range, text) {
     this._remove(range);
     if (text) {
         var end = this._insert(range.start, text);
@@ -313,7 +313,7 @@ ace.TextDocument.prototype.replace = function(range, text) {
     return end;
 };
 
-ace.TextDocument.prototype.indentRows = function(range, indentString) {
+ace.Document.prototype.indentRows = function(range, indentString) {
   for (var i=range.start.row; i<= range.end.row; i++) {
       this.lines[i] = indentString + this.getLine(i);
   }
@@ -321,7 +321,7 @@ ace.TextDocument.prototype.indentRows = function(range, indentString) {
   return indentString.length;
 };
 
-ace.TextDocument.prototype.outdentRows = function(range, indentString) {
+ace.Document.prototype.outdentRows = function(range, indentString) {
     outdentLength = indentString.length;
 
     for (var i=range.start.row; i<= range.end.row; i++) {
@@ -338,7 +338,7 @@ ace.TextDocument.prototype.outdentRows = function(range, indentString) {
     return -outdentLength;
 };
 
-ace.TextDocument.prototype.moveLinesUp = function(firstRow, lastRow) {
+ace.Document.prototype.moveLinesUp = function(firstRow, lastRow) {
     if (firstRow <= 0) return 0;
 
     var removed = this.lines.splice(firstRow, lastRow-firstRow+1);
@@ -348,7 +348,7 @@ ace.TextDocument.prototype.moveLinesUp = function(firstRow, lastRow) {
     return -1;
 };
 
-ace.TextDocument.prototype.moveLinesDown = function(firstRow, lastRow) {
+ace.Document.prototype.moveLinesDown = function(firstRow, lastRow) {
     if (lastRow >= this.lines.length-1) return 0;
 
     var removed = this.lines.splice(firstRow, lastRow-firstRow+1);
@@ -358,7 +358,7 @@ ace.TextDocument.prototype.moveLinesDown = function(firstRow, lastRow) {
     return 1;
 };
 
-ace.TextDocument.prototype.duplicateLines = function(firstRow, lastRow) {
+ace.Document.prototype.duplicateLines = function(firstRow, lastRow) {
     var firstRow = this._clipRowToDocument(firstRow);
     var lastRow = this._clipRowToDocument(lastRow);
 
@@ -371,7 +371,7 @@ ace.TextDocument.prototype.duplicateLines = function(firstRow, lastRow) {
     return addedRows;
 };
 
-ace.TextDocument.prototype._clipRowToDocument = function(row) {
+ace.Document.prototype._clipRowToDocument = function(row) {
     return Math.max(0, Math.min(row, this.lines.length-1));
 };
 
diff --git a/src/Editor.js b/src/Editor.js
index a15e7de6..b094a05e 100644
--- a/src/Editor.js
+++ b/src/Editor.js
@@ -23,7 +23,7 @@ ace.Editor = function(renderer, doc) {
     this._highlightLineMarker = null;
     this._blockScrolling = false;
 
-    this.setDocument(doc || new ace.TextDocument(""));
+    this.setDocument(doc || new ace.Document(""));
 };
 
 
diff --git a/test/ChangeDocumentTest.js b/test/ChangeDocumentTest.js
index 895fda1f..1a41c573 100644
--- a/test/ChangeDocumentTest.js
+++ b/test/ChangeDocumentTest.js
@@ -1,8 +1,8 @@
 var ChangeDocumentTest = new TestCase("ChangeDocumentTest", {
 
     setUp : function() {
-        this.doc1 = new ace.TextDocument(["abc", "def"].join("\n"));
-        this.doc2 = new ace.TextDocument(["ghi", "jkl"].join("\n"));
+        this.doc1 = new ace.Document(["abc", "def"].join("\n"));
+        this.doc2 = new ace.Document(["ghi", "jkl"].join("\n"));
         this.editor = new ace.Editor(new MockRenderer());
     },
 
diff --git a/test/NavigationTest.js b/test/NavigationTest.js
index f6baab0a..2d6470c4 100644
--- a/test/NavigationTest.js
+++ b/test/NavigationTest.js
@@ -3,7 +3,7 @@ var NavigationTest = TestCase("NavigationTest",
     createTextDocument : function(rows, cols) {
         var line = new Array(cols + 1).join("a");
         var text = new Array(rows).join(line + "\n") + line;
-        return new ace.TextDocument(text);
+        return new ace.Document(text);
     },
 
     "test: navigate to end of file should scroll the last line into view" : function() {
diff --git a/test/SelectionTest.js b/test/SelectionTest.js
index 95c81b14..e27ce332 100644
--- a/test/SelectionTest.js
+++ b/test/SelectionTest.js
@@ -3,7 +3,7 @@ var SelectionTest = TestCase("SelectionTest",
     createTextDocument : function(rows, cols) {
         var line = new Array(cols + 1).join("a");
         var text = new Array(rows).join(line + "\n") + line;
-        return new ace.TextDocument(text);
+        return new ace.Document(text);
     },
 
     "test: move cursor to end of file should place the cursor on last row and column" : function() {
@@ -49,7 +49,7 @@ var SelectionTest = TestCase("SelectionTest",
     },
 
     "test: move cursor word right" : function() {
-        var doc = new ace.TextDocument( ["ab",
+        var doc = new ace.Document( ["ab",
                 " Juhu Kinners (abc, 12)", " cde"].join("\n"));
         var selection = doc.getSelection();
 
@@ -89,7 +89,7 @@ var SelectionTest = TestCase("SelectionTest",
     },
 
     "test: select word right if cursor in word" : function() {
-        var doc = new ace.TextDocument("Juhu Kinners");
+        var doc = new ace.Document("Juhu Kinners");
         var selection = doc.getSelection();
 
         selection.moveCursorTo(0, 2);
@@ -99,7 +99,7 @@ var SelectionTest = TestCase("SelectionTest",
     },
 
     "test: moveCursor word left" : function() {
-        var doc = new ace.TextDocument( ["ab",
+        var doc = new ace.Document( ["ab",
                                          " Juhu Kinners (abc, 12)", " cde"].join("\n"));
         var selection = doc.getSelection();
 
@@ -140,7 +140,7 @@ var SelectionTest = TestCase("SelectionTest",
     },
 
     "test: select word left if cursor in word" : function() {
-        var doc = new ace.TextDocument("Juhu Kinners");
+        var doc = new ace.Document("Juhu Kinners");
         var selection = doc.getSelection();
 
         selection.moveCursorTo(0, 8);
@@ -150,7 +150,7 @@ var SelectionTest = TestCase("SelectionTest",
     },
 
     "test: select word right and select" : function() {
-        var doc = new ace.TextDocument("Juhu Kinners");
+        var doc = new ace.Document("Juhu Kinners");
         var selection = doc.getSelection();
 
         selection.moveCursorTo(0, 0);
@@ -163,7 +163,7 @@ var SelectionTest = TestCase("SelectionTest",
     },
 
     "test: select word left and select" : function() {
-        var doc = new ace.TextDocument("Juhu Kinners");
+        var doc = new ace.Document("Juhu Kinners");
         var selection = doc.getSelection();
 
         selection.moveCursorTo(0, 3);
@@ -176,7 +176,7 @@ var SelectionTest = TestCase("SelectionTest",
     },
 
     "test: select word with cursor in word should select the word" : function() {
-        var doc = new ace.TextDocument("Juhu Kinners 123");
+        var doc = new ace.Document("Juhu Kinners 123");
         var selection = doc.getSelection();
 
         selection.moveCursorTo(0, 8);
@@ -188,7 +188,7 @@ var SelectionTest = TestCase("SelectionTest",
     },
 
     "test: select word with cursor betwen white space and word should select the word" : function() {
-        var doc = new ace.TextDocument("Juhu Kinners");
+        var doc = new ace.Document("Juhu Kinners");
         var selection = doc.getSelection();
 
         selection.moveCursorTo(0, 4);
@@ -207,7 +207,7 @@ var SelectionTest = TestCase("SelectionTest",
     },
 
     "test: select word with cursor in white space should select white space" : function() {
-        var doc = new ace.TextDocument("Juhu  Kinners");
+        var doc = new ace.Document("Juhu  Kinners");
         var selection = doc.getSelection();
 
         selection.moveCursorTo(0, 5);
diff --git a/test/TextDocumentTest.js b/test/TextDocumentTest.js
index 58539654..4a8b8e62 100644
--- a/test/TextDocumentTest.js
+++ b/test/TextDocumentTest.js
@@ -1,7 +1,7 @@
 var TextDocumentTest = new TestCase("TextDocumentTest", {
 
    "test: find matching opening bracket" : function() {
-        var doc = new ace.TextDocument(["(()(", "())))"].join("\n"));
+        var doc = new ace.Document(["(()(", "())))"].join("\n"));
 
         assertPosition(0, 1, doc.findMatchingBracket({row: 0, column: 3}));
         assertPosition(1, 0, doc.findMatchingBracket({row: 1, column: 2}));
@@ -11,7 +11,7 @@ var TextDocumentTest = new TestCase("TextDocumentTest", {
     },
 
     "test: find matching closing bracket" : function() {
-        var doc = new ace.TextDocument(["(()(", "())))"].join("\n"));
+        var doc = new ace.Document(["(()(", "())))"].join("\n"));
 
         assertPosition(1, 1, doc.findMatchingBracket({row: 1, column: 1}));
         assertPosition(1, 1, doc.findMatchingBracket({row: 1, column: 1}));
@@ -22,7 +22,7 @@ var TextDocumentTest = new TestCase("TextDocumentTest", {
     },
 
     "test: match different bracket types" : function() {
-        var doc = new ace.TextDocument(["({[", ")]}"].join("\n"));
+        var doc = new ace.Document(["({[", ")]}"].join("\n"));
 
         assertPosition(1, 0, doc.findMatchingBracket({row: 0, column: 1}));
         assertPosition(1, 2, doc.findMatchingBracket({row: 0, column: 2}));
@@ -34,7 +34,7 @@ var TextDocumentTest = new TestCase("TextDocumentTest", {
     },
 
     "test: move lines down" : function() {
-        var doc = new ace.TextDocument(["1", "2", "3", "4"].join("\n"));
+        var doc = new ace.Document(["1", "2", "3", "4"].join("\n"));
 
         doc.moveLinesDown(0, 1);
         assertEquals(["3", "1", "2", "4"].join("\n"), doc.toString());
@@ -50,7 +50,7 @@ var TextDocumentTest = new TestCase("TextDocumentTest", {
     },
 
     "test: move lines up" : function() {
-        var doc = new ace.TextDocument(["1", "2", "3", "4"].join("\n"));
+        var doc = new ace.Document(["1", "2", "3", "4"].join("\n"));
 
         doc.moveLinesUp(2, 3);
         assertEquals(["1", "3", "4", "2"].join("\n"), doc.toString());
@@ -66,21 +66,21 @@ var TextDocumentTest = new TestCase("TextDocumentTest", {
     },
 
     "test: duplicate lines" : function() {
-        var doc = new ace.TextDocument(["1", "2", "3", "4"].join("\n"));
+        var doc = new ace.Document(["1", "2", "3", "4"].join("\n"));
 
         doc.duplicateLines(1, 2);
         assertEquals(["1", "2", "3", "2", "3", "4"].join("\n"), doc.toString());
     },
 
     "test: duplicate last line" : function() {
-        var doc = new ace.TextDocument(["1", "2", "3"].join("\n"));
+        var doc = new ace.Document(["1", "2", "3"].join("\n"));
 
         doc.duplicateLines(2, 2);
         assertEquals(["1", "2", "3", "3"].join("\n"), doc.toString());
     },
 
     "test: duplicate first line" : function() {
-        var doc = new ace.TextDocument(["1", "2", "3"].join("\n"));
+        var doc = new ace.Document(["1", "2", "3"].join("\n"));
 
         doc.duplicateLines(0, 0);
         assertEquals(["1", "1", "2", "3"].join("\n"), doc.toString());
diff --git a/test/TextEditTest.js b/test/TextEditTest.js
index 7bec2205..f05ef3cc 100644
--- a/test/TextEditTest.js
+++ b/test/TextEditTest.js
@@ -1,7 +1,7 @@
 var TextEditTest = TestCase("TextEditTest",
 {
     "test: delete line from the middle" : function() {
-        var doc = new ace.TextDocument(["a", "b", "c", "d"].join("\n"));
+        var doc = new ace.Document(["a", "b", "c", "d"].join("\n"));
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(1, 1);
@@ -27,7 +27,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: delete multiple selected lines" : function() {
-        var doc = new ace.TextDocument(["a", "b", "c", "d"].join("\n"));
+        var doc = new ace.Document(["a", "b", "c", "d"].join("\n"));
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(1, 1);
@@ -39,7 +39,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: delete first line" : function() {
-        var doc = new ace.TextDocument(["a", "b", "c"].join("\n"));
+        var doc = new ace.Document(["a", "b", "c"].join("\n"));
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.removeLines();
@@ -49,7 +49,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: delete last" : function() {
-        var doc = new ace.TextDocument(["a", "b", "c"].join("\n"));
+        var doc = new ace.Document(["a", "b", "c"].join("\n"));
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(2, 1);
@@ -60,7 +60,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: indent block" : function() {
-        var doc = new ace.TextDocument(["a12345", "b12345", "c12345"].join("\n"));
+        var doc = new ace.Document(["a12345", "b12345", "c12345"].join("\n"));
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(1, 3);
@@ -79,7 +79,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: outdent block" : function() {
-        var doc = new ace.TextDocument(["    a12345", "  b12345", "    c12345"].join("\n"));
+        var doc = new ace.Document(["    a12345", "  b12345", "    c12345"].join("\n"));
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(0, 3);
@@ -107,7 +107,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: outent without a selection should update cursor" : function() {
-        var doc = new ace.TextDocument("        12");
+        var doc = new ace.Document("        12");
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(0, 3);
@@ -118,7 +118,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: comment lines should perserve selection" : function() {
-        var doc = new ace.TextDocument(["  abc", "cde"].join("\n"), new ace.mode.JavaScript());
+        var doc = new ace.Document(["  abc", "cde"].join("\n"), new ace.mode.JavaScript());
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(0, 2);
@@ -134,7 +134,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: uncomment lines should perserve selection" : function() {
-        var doc = new ace.TextDocument(["//  abc", "//cde"].join("\n"), new ace.mode.JavaScript());
+        var doc = new ace.Document(["//  abc", "//cde"].join("\n"), new ace.mode.JavaScript());
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(0, 1);
@@ -152,7 +152,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: move lines down should select moved lines" : function() {
-        var doc = new ace.TextDocument(["11", "22", "33", "44"].join("\n"));
+        var doc = new ace.Document(["11", "22", "33", "44"].join("\n"));
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(0, 1);
@@ -179,7 +179,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: move lines up should select moved lines" : function() {
-        var doc = new ace.TextDocument(["11", "22", "33", "44"].join("\n"));
+        var doc = new ace.Document(["11", "22", "33", "44"].join("\n"));
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(2, 1);
@@ -200,7 +200,7 @@ var TextEditTest = TestCase("TextEditTest",
 
     "test: move line without active selection should move cursor to start of the moved line" : function()
     {
-        var doc = new ace.TextDocument(["11", "22", "33", "44"].join("\n"));
+        var doc = new ace.Document(["11", "22", "33", "44"].join("\n"));
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(1, 1);
@@ -218,7 +218,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: copy lines down should select lines and place cursor at the selection start" : function() {
-        var doc = new ace.TextDocument(["11", "22", "33", "44"].join("\n"));
+        var doc = new ace.Document(["11", "22", "33", "44"].join("\n"));
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(1, 1);
@@ -233,7 +233,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: copy lines up should select lines and place cursor at the selection start" : function() {
-        var doc = new ace.TextDocument(["11", "22", "33", "44"].join("\n"));
+        var doc = new ace.Document(["11", "22", "33", "44"].join("\n"));
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         editor.moveCursorTo(1, 1);
@@ -248,7 +248,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: input a tab with soft tab should convert it to spaces" : function() {
-        var doc = new ace.TextDocument("");
+        var doc = new ace.Document("");
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         doc.setTabSize(2);
@@ -263,7 +263,7 @@ var TextEditTest = TestCase("TextEditTest",
     },
 
     "test: input tab without soft tabs should keep the tab character" : function() {
-        var doc = new ace.TextDocument("");
+        var doc = new ace.Document("");
         var editor = new ace.Editor(new MockRenderer(), doc);
 
         doc.setUseSoftTabs(false);
diff --git a/test/mode/CssTest.js b/test/mode/CssTest.js
index c7abdc0c..f31f01b4 100644
--- a/test/mode/CssTest.js
+++ b/test/mode/CssTest.js
@@ -5,7 +5,7 @@ var CssTest = new TestCase("mode.CssTest", {
     },
 
     "test: toggle comment lines should not do anything" : function() {
-        var doc = new ace.TextDocument(["  abc", "cde", "fg"].join("\n"));
+        var doc = new ace.Document(["  abc", "cde", "fg"].join("\n"));
 
         var range =  {
             start: {row: 0, column: 3},
diff --git a/test/mode/JavaScriptTest.js b/test/mode/JavaScriptTest.js
index 6804f369..436d3703 100644
--- a/test/mode/JavaScriptTest.js
+++ b/test/mode/JavaScriptTest.js
@@ -14,7 +14,7 @@ var JavaScriptTest = new TestCase("mode.JavaScriptTest", {
     },
 
     "test: toggle comment lines should prepend '//' to each line" : function() {
-        var doc = new ace.TextDocument(["  abc", "cde", "fg"].join("\n"));
+        var doc = new ace.Document(["  abc", "cde", "fg"].join("\n"));
 
         var range =  {
             start: {row: 0, column: 3},
@@ -26,7 +26,7 @@ var JavaScriptTest = new TestCase("mode.JavaScriptTest", {
     },
 
     "test: toggle comment on commented lines should remove leading '//' chars" : function() {
-        var doc = new ace.TextDocument(["//  abc", "//cde", "fg"].join("\n"));
+        var doc = new ace.Document(["//  abc", "//cde", "fg"].join("\n"));
 
         var range =  {
             start: {row: 0, column: 3},
@@ -38,7 +38,7 @@ var JavaScriptTest = new TestCase("mode.JavaScriptTest", {
     },
 
     "test: toggle comment on multiple lines with one commented line prepend '//' to each line" : function() {
-        var doc = new ace.TextDocument(["//  abc", "//cde", "fg"].join("\n"));
+        var doc = new ace.Document(["//  abc", "//cde", "fg"].join("\n"));
 
         var range =  {
             start: {row: 0, column: 3},
diff --git a/test/mode/TextTest.js b/test/mode/TextTest.js
index 63418d7e..2d53207b 100644
--- a/test/mode/TextTest.js
+++ b/test/mode/TextTest.js
@@ -5,7 +5,7 @@ var TextTest = new TestCase("mode.TextTest", {
     },
 
     "test: toggle comment lines should not do anything" : function() {
-        var doc = new ace.TextDocument(["  abc", "cde", "fg"].join("\n"));
+        var doc = new ace.Document(["  abc", "cde", "fg"].join("\n"));
 
         var range =  {
             start: {row: 0, column: 3},
diff --git a/test/mode/XmlTest.js b/test/mode/XmlTest.js
index d9768344..0b928c98 100644
--- a/test/mode/XmlTest.js
+++ b/test/mode/XmlTest.js
@@ -14,7 +14,7 @@ var XmlTest = new TestCase("mode.XmlTest", {
     },
 
     "test: toggle comment lines should not do anything" : function() {
-        var doc = new ace.TextDocument(["  abc", "cde", "fg"].join("\n"));
+        var doc = new ace.Document(["  abc", "cde", "fg"].join("\n"));
 
         var range =  {
             start: {row: 0, column: 3},