diff --git a/demo/editor-build.html b/demo/editor-build.html
index 69a6be05..32deec81 100644
--- a/demo/editor-build.html
+++ b/demo/editor-build.html
@@ -154,17 +154,20 @@ require(
         Renderer,
         theme,
         Document,
-        JavaScriptMode,
+        jsMod,
         cssMod,
         htmlMod,
-        XmlMode,
-        TextMode,
+        xmlMod,
+        textMod,
         UndoManager
     ) {
 
 var event = eventMod.event;
+var JavaScriptMode = jsMod.JavaScript;
 var CssMode = cssMod.Css;
 var HtmlMode = htmlMod.Html;
+var XmlMode = xmlMod.Xml;
+var TextMode = textMod.Text;
 
 var docs = {}
 
diff --git a/editor.html b/editor.html
index c97f089c..a4ddddff 100644
--- a/editor.html
+++ b/editor.html
@@ -153,17 +153,20 @@ require(
         Renderer,
         theme,
         Document,
-        JavaScriptMode,
+        jsMod,
         cssMod,
         htmlMod,
-        XmlMode,
-        TextMode,
+        xmlMod,
+        textMod,
         UndoManager
     ) {
 
 var event = eventMod.event;
+var JavaScriptMode = jsMod.JavaScript;
 var CssMode = cssMod.Css;
 var HtmlMode = htmlMod.Html;
+var XmlMode = xmlMod.Xml;
+var TextMode = textMod.Text;
 
 var docs = {}
 
diff --git a/lib/ace/document.js b/lib/ace/document.js
index 2136655d..3a799655 100644
--- a/lib/ace/document.js
+++ b/lib/ace/document.js
@@ -41,7 +41,7 @@ var oop = require("ace/lib/oop").oop;
 var lang = require("ace/lib/lang").lang;
 var MEventEmitter = require("ace/event_emitter").MEventEmitter;
 var Selection = require("ace/selection");
-var TextMode = require("ace/mode/text");
+var TextMode = require("ace/mode/text").Text;
 var Range = require("ace/range");
 
 var Document = function(text, mode) {
diff --git a/lib/ace/mode/css.js b/lib/ace/mode/css.js
index 50c1dc24..5cd98aae 100644
--- a/lib/ace/mode/css.js
+++ b/lib/ace/mode/css.js
@@ -38,10 +38,10 @@
 define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
-var TextMode = require("ace/mode/text");
+var TextMode = require("ace/mode/text").Text;
 var Tokenizer = require("ace/tokenizer");
 var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules;
-var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent");
+var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
 
 var Css = function() {
     this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules());
diff --git a/lib/ace/mode/css_highlight_rules.js b/lib/ace/mode/css_highlight_rules.js
index c3482711..b06199ff 100644
--- a/lib/ace/mode/css_highlight_rules.js
+++ b/lib/ace/mode/css_highlight_rules.js
@@ -39,7 +39,7 @@ define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
 var lang = require("ace/lib/lang").lang;
-var TextHighlightRules = require("ace/mode/text_highlight_rules");
+var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var CssHighlightRules = function() {
 
diff --git a/lib/ace/mode/doc_comment_highlight_rules.js b/lib/ace/mode/doc_comment_highlight_rules.js
index 79160af0..ac9dda55 100644
--- a/lib/ace/mode/doc_comment_highlight_rules.js
+++ b/lib/ace/mode/doc_comment_highlight_rules.js
@@ -38,7 +38,7 @@
 define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
-var TextHighlightRules = require("ace/mode/text_highlight_rules");
+var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var DocCommentHighlightRules = function() {
 
diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js
index 7e8314f0..50c00c98 100644
--- a/lib/ace/mode/html.js
+++ b/lib/ace/mode/html.js
@@ -38,8 +38,8 @@
 define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
-var TextMode = require("ace/mode/text");
-var JavaScriptMode = require("ace/mode/javascript");
+var TextMode = require("ace/mode/text").Text;
+var JavaScriptMode = require("ace/mode/javascript").JavaScript;
 var CssMode = require("ace/mode/css").Css;
 var Tokenizer = require("ace/tokenizer");
 var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules;
diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js
index e6032b54..4ba538c6 100644
--- a/lib/ace/mode/html_highlight_rules.js
+++ b/lib/ace/mode/html_highlight_rules.js
@@ -39,8 +39,8 @@ define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
 var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules;
-var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules");
-var TextHighlightRules = require("ace/mode/text_highlight_rules");
+var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules;
+var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var HtmlHighlightRules = function() {
 
diff --git a/lib/ace/mode/javascript.js b/lib/ace/mode/javascript.js
index 9cff8ab7..9d2be2bb 100644
--- a/lib/ace/mode/javascript.js
+++ b/lib/ace/mode/javascript.js
@@ -38,10 +38,10 @@
 define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
-var TextMode = require("ace/mode/text");
+var TextMode = require("ace/mode/text").Text;
 var Tokenizer = require("ace/tokenizer");
-var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules");
-var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent");
+var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules;
+var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("ace/range");
 
 var JavaScript = function() {
@@ -123,5 +123,5 @@ oop.inherits(JavaScript, TextMode);
 
 }).call(JavaScript.prototype);
 
-return JavaScript;
+exports.JavaScript = JavaScript;
 });
diff --git a/lib/ace/mode/javascript_highlight_rules.js b/lib/ace/mode/javascript_highlight_rules.js
index ab7ffbd9..0a054e5f 100644
--- a/lib/ace/mode/javascript_highlight_rules.js
+++ b/lib/ace/mode/javascript_highlight_rules.js
@@ -40,7 +40,7 @@ define(function(require, exports, module) {
 var oop = require("ace/lib/oop").oop;
 var lang = require("ace/lib/lang").lang;
 var DocCommentHighlightRules = require("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("ace/mode/text_highlight_rules");
+var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 JavaScriptHighlightRules = function() {
 
@@ -159,5 +159,5 @@ JavaScriptHighlightRules = function() {
 
 oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
 
-return JavaScriptHighlightRules;
-});
\ No newline at end of file
+exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
+});
diff --git a/lib/ace/mode/matching_brace_outdent.js b/lib/ace/mode/matching_brace_outdent.js
index 3c871a14..4509dac9 100644
--- a/lib/ace/mode/matching_brace_outdent.js
+++ b/lib/ace/mode/matching_brace_outdent.js
@@ -78,5 +78,5 @@ var MatchingBraceOutdent = function() {};
 
 }).call(MatchingBraceOutdent.prototype);
 
-return MatchingBraceOutdent;
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
 });
diff --git a/lib/ace/mode/text.js b/lib/ace/mode/text.js
index 3ee899d1..d5e2873c 100644
--- a/lib/ace/mode/text.js
+++ b/lib/ace/mode/text.js
@@ -38,7 +38,7 @@
 define(function(require, exports, module) {
 
 var Tokenizer = require("ace/tokenizer");
-var TextHighlightRules = require("ace/mode/text_highlight_rules");
+var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var Text = function() {
     this.$tokenizer = new Tokenizer(new TextHighlightRules().getRules());
@@ -76,5 +76,5 @@ var Text = function() {
 
 }).call(Text.prototype);
 
-return Text;
-});
\ No newline at end of file
+exports.Text = Text;
+});
diff --git a/lib/ace/mode/text_highlight_rules.js b/lib/ace/mode/text_highlight_rules.js
index c5331061..3f5351ce 100644
--- a/lib/ace/mode/text_highlight_rules.js
+++ b/lib/ace/mode/text_highlight_rules.js
@@ -73,5 +73,5 @@ var TextHighlightRules = function() {
 
 }).call(TextHighlightRules.prototype);
 
-return TextHighlightRules;
-});
\ No newline at end of file
+exports.TextHighlightRules = TextHighlightRules;
+});
diff --git a/lib/ace/mode/xml.js b/lib/ace/mode/xml.js
index 2603d023..411097ef 100644
--- a/lib/ace/mode/xml.js
+++ b/lib/ace/mode/xml.js
@@ -38,9 +38,9 @@
 define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
-var TextMode = require("ace/mode/text");
+var TextMode = require("ace/mode/text").Text;
 var Tokenizer = require("ace/tokenizer");
-var XmlHighlightRules = require("ace/mode/xml_highlight_rules");
+var XmlHighlightRules = require("ace/mode/xml_highlight_rules").XmlHighlightRules;
 
 var Xml = function() {
     this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
@@ -56,5 +56,5 @@ oop.inherits(Xml, TextMode);
 
 }).call(Xml.prototype);
 
-return Xml;
-});
\ No newline at end of file
+exports.Xml = Xml;
+});
diff --git a/lib/ace/mode/xml_highlight_rules.js b/lib/ace/mode/xml_highlight_rules.js
index 28255835..923a092e 100644
--- a/lib/ace/mode/xml_highlight_rules.js
+++ b/lib/ace/mode/xml_highlight_rules.js
@@ -38,7 +38,7 @@
 define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
-var TextHighlightRules = require("ace/mode/text_highlight_rules");
+var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var XmlHighlightRules = function() {
 
@@ -114,5 +114,5 @@ var XmlHighlightRules = function() {
 
 oop.inherits(XmlHighlightRules, TextHighlightRules);
 
-return XmlHighlightRules;
-});
\ No newline at end of file
+exports.XmlHighlightRules = XmlHighlightRules;
+});
diff --git a/lib/ace/test/change_document_test.js b/lib/ace/test/change_document_test.js
index 796b9e42..70defe67 100644
--- a/lib/ace/test/change_document_test.js
+++ b/lib/ace/test/change_document_test.js
@@ -15,11 +15,13 @@ require.def([
  ], function(
      Document,
      Editor,
-     TextMode,
-     JavaScriptMode,
+     textMod,
+     jsMod,
      MockRenderer
  ) {
 
+var TextMode = textMod.Text;
+var JavaScriptMode = jsMod.JavaScript;
 var ChangeDocumentTest = new TestCase("ChangeDocumentTest", {
     setUp : function() {
         this.doc1 = new Document(["abc", "def"].join("\n"));
diff --git a/lib/ace/test/mode/css_test.js b/lib/ace/test/mode/css_test.js
index 0660ad56..c3d853aa 100644
--- a/lib/ace/test/mode/css_test.js
+++ b/lib/ace/test/mode/css_test.js
@@ -13,10 +13,11 @@ require.def([
  ], function(
      Document,
      Range,
-     CssMode
+     cssMod
  ) {
 
-    var CssTest = new TestCase("mode.CssTest", {
+var CssMode = cssMod.Css;
+var CssTest = new TestCase("mode.CssTest", {
 
     setUp : function() {
         this.mode = new CssMode();
diff --git a/lib/ace/test/mode/css_tokenizer_test.js b/lib/ace/test/mode/css_tokenizer_test.js
index d6200751..99c1c752 100644
--- a/lib/ace/test/mode/css_tokenizer_test.js
+++ b/lib/ace/test/mode/css_tokenizer_test.js
@@ -9,9 +9,10 @@
 require.def([
      "ace/mode/Css"
  ], function(
-     CssMode
+     cssMod
  ) {
 
+var CssMode = cssMod.Css;
 var CssTest = new TestCase("mode.CssTest", {
 
     setUp : function() {
diff --git a/lib/ace/test/mode/html_test.js b/lib/ace/test/mode/html_test.js
index d809315f..1f8e8f63 100644
--- a/lib/ace/test/mode/html_test.js
+++ b/lib/ace/test/mode/html_test.js
@@ -13,9 +13,10 @@ require.def([
  ], function(
      Document,
      Range,
-     HtmlMode
+     htmlMod
  ) {
 
+var HtmlMode = htmlMod.Html;
 var HtmlTest = new TestCase("mode.HtmlTest", {
 
     setUp : function() {
diff --git a/lib/ace/test/mode/html_tokenizer_test.js b/lib/ace/test/mode/html_tokenizer_test.js
index b538e4c4..42f20e45 100644
--- a/lib/ace/test/mode/html_tokenizer_test.js
+++ b/lib/ace/test/mode/html_tokenizer_test.js
@@ -9,9 +9,10 @@
 require.def([
      "ace/mode/Html"
  ], function(
-     HtmlMode
+     htmlMod
  ) {
 
+var HtmlMode = htmlMod.Html;
 var HtmlTest = new TestCase("mode.HtmlTest", {
 
     setUp : function() {
diff --git a/lib/ace/test/mode/javascript_test.js b/lib/ace/test/mode/javascript_test.js
index 8f61d55a..70d1706d 100644
--- a/lib/ace/test/mode/javascript_test.js
+++ b/lib/ace/test/mode/javascript_test.js
@@ -15,9 +15,10 @@ require.def([
      Document,
      Range,
      Tokenizer,
-     JavaScriptMode
+     jsMod
  ) {
 
+var JavaScriptMode = jsMod.JavaScript;
 var JavaScriptTest = new TestCase("mode.JavaScriptTest", {
 
     setUp : function() {
diff --git a/lib/ace/test/mode/javascript_tokenizer_test.js b/lib/ace/test/mode/javascript_tokenizer_test.js
index 65f40f21..667b026e 100644
--- a/lib/ace/test/mode/javascript_tokenizer_test.js
+++ b/lib/ace/test/mode/javascript_tokenizer_test.js
@@ -9,9 +9,10 @@
 require.def([
      "ace/mode/JavaScript"
  ], function(
-     JavaScriptMode
+     jsMod
  ) {
 
+var JavaScriptMode = jsMod.JavaScript;
 var JavaScriptTokenizerTest = new TestCase("mode.JavaScriptTokenizerTest", {
 
     setUp : function() {
diff --git a/lib/ace/test/mode/text_test.js b/lib/ace/test/mode/text_test.js
index 252b867e..33b53278 100644
--- a/lib/ace/test/mode/text_test.js
+++ b/lib/ace/test/mode/text_test.js
@@ -13,9 +13,10 @@ require.def([
  ], function(
      Document,
      Range,
-     TextMode
+     textMod
  ) {
 
+var TextMode = textMod.Text;
 var TextTest = new TestCase("mode.TextTest", {
 
     setUp : function() {
diff --git a/lib/ace/test/mode/xml_test.js b/lib/ace/test/mode/xml_test.js
index 8c8e7f92..ae4fbfdf 100644
--- a/lib/ace/test/mode/xml_test.js
+++ b/lib/ace/test/mode/xml_test.js
@@ -15,9 +15,10 @@ require.def([
      Document,
      Range,
      Tokenizer,
-     XmlMode
+     xmlMod
  ) {
 
+var XmlMode = xmlMod.Xml;
 var XmlTest = new TestCase("mode.XmlTest", {
 
     setUp : function() {
diff --git a/lib/ace/test/mode/xml_tokenizer_test.js b/lib/ace/test/mode/xml_tokenizer_test.js
index 3963fa70..740d7619 100644
--- a/lib/ace/test/mode/xml_tokenizer_test.js
+++ b/lib/ace/test/mode/xml_tokenizer_test.js
@@ -9,9 +9,10 @@
 require.def([
      "ace/mode/Xml"
  ], function(
-     XmlMode
+     xmlMod
  ) {
 
+var XmlMode = xmlMod.Xml;
 var XmlTest = new TestCase("mode.XmlTest", {
 
     setUp : function() {
diff --git a/lib/ace/test/text_edit_test.js b/lib/ace/test/text_edit_test.js
index 654529db..733d0d94 100644
--- a/lib/ace/test/text_edit_test.js
+++ b/lib/ace/test/text_edit_test.js
@@ -14,10 +14,11 @@ require.def([
  ], function(
      Document,
      Editor,
-     JavaScriptMode,
+     jsMod,
      MockRenderer
  ) {
 
+var JavaScriptMode = jsMod.JavaScript;
 var TextEditTest = TestCase("TextEditTest",
 {
     "test: delete line from the middle" : function() {