diff --git a/demo/editor-build.html b/demo/editor-build.html
index 6a58e532..5314a418 100644
--- a/demo/editor-build.html
+++ b/demo/editor-build.html
@@ -159,20 +159,19 @@ require(
         htmlMod,
         xmlMod,
         textMod,
-        UndoManager
+        undoMod
     ) {
 
 var event = eventMod.event;
 var Editor = editorMod.Editor;
 
-
 var Document = docMod.Document;
 var JavaScriptMode = jsMod.JavaScript;
 var CssMode = cssMod.Css;
 var HtmlMode = htmlMod.Html;
 var XmlMode = xmlMod.Xml;
 var TextMode = textMod.Text;
-
+var UndoManager = undoMod.UndoManager;
 
 var docs = {}
 
diff --git a/editor.html b/editor.html
index b84383b7..b70c9b7a 100644
--- a/editor.html
+++ b/editor.html
@@ -158,20 +158,19 @@ require(
         htmlMod,
         xmlMod,
         textMod,
-        UndoManager
+        undoMod
     ) {
 
 var event = eventMod.event;
 var Editor = editorMod.Editor;
 
-
 var Document = docMod.Document;
 var JavaScriptMode = jsMod.JavaScript;
 var CssMode = cssMod.Css;
 var HtmlMode = htmlMod.Html;
 var XmlMode = xmlMod.Xml;
 var TextMode = textMod.Text;
-
+var UndoManager = undoMod.UndoManager;
 
 var docs = {}
 
diff --git a/lib/ace/mode/css.js b/lib/ace/mode/css.js
index 5cd98aae..743f5863 100644
--- a/lib/ace/mode/css.js
+++ b/lib/ace/mode/css.js
@@ -39,7 +39,7 @@ define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
 var TextMode = require("ace/mode/text").Text;
-var Tokenizer = require("ace/tokenizer");
+var Tokenizer = require("ace/tokenizer").Tokenizer;
 var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules;
 var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
 
diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js
index 50c00c98..b078fcd6 100644
--- a/lib/ace/mode/html.js
+++ b/lib/ace/mode/html.js
@@ -41,7 +41,7 @@ var oop = require("ace/lib/oop").oop;
 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 Tokenizer = require("ace/tokenizer").Tokenizer;
 var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules;
 
 var Html = function() {
diff --git a/lib/ace/mode/javascript.js b/lib/ace/mode/javascript.js
index c07192d2..64a86d1b 100644
--- a/lib/ace/mode/javascript.js
+++ b/lib/ace/mode/javascript.js
@@ -39,7 +39,7 @@ define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
 var TextMode = require("ace/mode/text").Text;
-var Tokenizer = require("ace/tokenizer");
+var Tokenizer = require("ace/tokenizer").Tokenizer;
 var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules;
 var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("ace/range").Range;
diff --git a/lib/ace/mode/text.js b/lib/ace/mode/text.js
index d5e2873c..1a73194f 100644
--- a/lib/ace/mode/text.js
+++ b/lib/ace/mode/text.js
@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var Tokenizer = require("ace/tokenizer");
+var Tokenizer = require("ace/tokenizer").Tokenizer;
 var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var Text = function() {
diff --git a/lib/ace/mode/xml.js b/lib/ace/mode/xml.js
index 411097ef..a8fb60ca 100644
--- a/lib/ace/mode/xml.js
+++ b/lib/ace/mode/xml.js
@@ -39,7 +39,7 @@ define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
 var TextMode = require("ace/mode/text").Text;
-var Tokenizer = require("ace/tokenizer");
+var Tokenizer = require("ace/tokenizer").Tokenizer;
 var XmlHighlightRules = require("ace/mode/xml_highlight_rules").XmlHighlightRules;
 
 var Xml = function() {
diff --git a/lib/ace/tokenizer.js b/lib/ace/tokenizer.js
index 79e9082d..c5cdf964 100644
--- a/lib/ace/tokenizer.js
+++ b/lib/ace/tokenizer.js
@@ -128,5 +128,5 @@ var Tokenizer = function(rules) {
 
 }).call(Tokenizer.prototype);
 
-return Tokenizer;
-});
\ No newline at end of file
+exports.Tokenizer = Tokenizer;
+});
diff --git a/lib/ace/undomanager.js b/lib/ace/undomanager.js
index 79a4ad7b..4ef90fef 100644
--- a/lib/ace/undomanager.js
+++ b/lib/ace/undomanager.js
@@ -73,5 +73,5 @@ var UndoManager = function() {
 
 }).call(UndoManager.prototype);
 
-return UndoManager;
-});
\ No newline at end of file
+exports.UndoManager = UndoManager;
+});