diff --git a/lib/ace/background_tokenizer.js b/lib/ace/background_tokenizer.js
index 7e1cc2fe..811eeb8d 100644
--- a/lib/ace/background_tokenizer.js
+++ b/lib/ace/background_tokenizer.js
@@ -103,7 +103,7 @@ var BackgroundTokenizer = function(tokenizer, editor) {
             first: firstRow,
             last: lastRow
         };
-        this.$dispatchEvent("update", {data: data});
+        this._dispatchEvent("update", {data: data});
     };
 
     this.start = function(startRow) {
diff --git a/lib/ace/document.js b/lib/ace/document.js
index b2544601..20623309 100644
--- a/lib/ace/document.js
+++ b/lib/ace/document.js
@@ -94,7 +94,7 @@ var Document = function(text, mode) {
             firstRow: firstRow,
             lastRow: lastRow
         };
-        this.$dispatchEvent("change", { data: data});
+        this._dispatchEvent("change", { data: data});
     };
 
     this.setUndoManager = function(undoManager) {
@@ -153,7 +153,7 @@ var Document = function(text, mode) {
 
         this.modified = true;
         this.$tabSize = tabSize;
-        this.$dispatchEvent("changeTabSize");
+        this._dispatchEvent("changeTabSize");
     };
 
     this.getTabSize = function() {
@@ -169,22 +169,22 @@ var Document = function(text, mode) {
         for (var i=0; i<rows.length; i++) {
             this.$breakpoints[rows[i]] = true;
         }
-        this.$dispatchEvent("changeBreakpoint", {});
+        this._dispatchEvent("changeBreakpoint", {});
     };
 
     this.clearBreakpoints = function() {
         this.$breakpoints = [];
-        this.$dispatchEvent("changeBreakpoint", {});
+        this._dispatchEvent("changeBreakpoint", {});
     };
 
     this.setBreakpoint = function(row) {
         this.$breakpoints[row] = true;
-        this.$dispatchEvent("changeBreakpoint", {});
+        this._dispatchEvent("changeBreakpoint", {});
     };
 
     this.clearBreakpoint = function(row) {
         delete this.$breakpoints[row];
-        this.$dispatchEvent("changeBreakpoint", {});
+        this._dispatchEvent("changeBreakpoint", {});
     };
 
     this.$detectNewLine = function(text) {
@@ -260,7 +260,7 @@ var Document = function(text, mode) {
         if (this.$mode === mode) return;
 
         this.$mode = mode;
-        this.$dispatchEvent("changeMode");
+        this._dispatchEvent("changeMode");
     };
 
     this.getMode = function() {
@@ -275,7 +275,7 @@ var Document = function(text, mode) {
         if (this.$scrollTop === scrollTopRow) return;
 
         this.$scrollTop = scrollTopRow;
-        this.$dispatchEvent("changeScrollTop");
+        this._dispatchEvent("changeScrollTop");
     };
 
     this.getScrollTopRow = function() {
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 26bdb04f..487857ef 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -493,7 +493,7 @@ var Editor =function(renderer, doc) {
         this.onCursorChange();
         this.$blockScrolling = false;
 
-        this.$dispatchEvent("changeOverwrite", {data: overwrite});
+        this._dispatchEvent("changeOverwrite", {data: overwrite});
     };
 
     this.getOverwrite = function() {
@@ -520,7 +520,7 @@ var Editor =function(renderer, doc) {
 
         this.$selectionStyle = style;
         this.onSelectionChange();
-        this.$dispatchEvent("changeSelectionStyle", {data: style});
+        this._dispatchEvent("changeSelectionStyle", {data: style});
     };
 
 
diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index 24727915..61c35d0c 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -77,7 +77,7 @@ var Text = function(parentEl) {
             var size = self.$measureSizes();
             if (self.$characterSize.width !== size.width || self.$characterSize.height !== size.height) {
                 self.$characterSize = size;
-                self.$dispatchEvent("changeCharaterSize", {data: size});
+                self._dispatchEvent("changeCharaterSize", {data: size});
             }
         }, 500);
     };
diff --git a/lib/ace/scrollbar.js b/lib/ace/scrollbar.js
index 019d0ce9..85a6e6b7 100644
--- a/lib/ace/scrollbar.js
+++ b/lib/ace/scrollbar.js
@@ -62,7 +62,7 @@ var ScrollBar = function(parent) {
     oop.implement(this, EventEmitter);
 
     this.onScroll = function() {
-      this.$dispatchEvent("scroll", {data: this.element.scrollTop});
+      this._dispatchEvent("scroll", {data: this.element.scrollTop});
     };
 
     this.getWidth = function() {
diff --git a/lib/ace/selection.js b/lib/ace/selection.js
index 849aaad6..3b551667 100644
--- a/lib/ace/selection.js
+++ b/lib/ace/selection.js
@@ -79,11 +79,11 @@ var Selection = function(doc) {
 
         if (!this.selectionAnchor) {
             this.selectionAnchor = anchor;
-            this.$dispatchEvent("changeSelection", {});
+            this._dispatchEvent("changeSelection", {});
         }
         else if (this.selectionAnchor.row !== anchor.row || this.selectionAnchor.column !== anchor.column) {
             this.selectionAnchor = anchor;
-            this.$dispatchEvent("changeSelection", {});
+            this._dispatchEvent("changeSelection", {});
         }
 
     };
@@ -142,7 +142,7 @@ var Selection = function(doc) {
     this.clearSelection = function() {
         if (this.selectionAnchor) {
             this.selectionAnchor = null;
-            this.$dispatchEvent("changeSelection", {});
+            this._dispatchEvent("changeSelection", {});
         }
     };
 
@@ -181,7 +181,7 @@ var Selection = function(doc) {
         }
 
         if (changed)
-            this.$dispatchEvent("changeSelection", {});
+            this._dispatchEvent("changeSelection", {});
     };
 
     this.selectTo = function(row, column) {
@@ -381,7 +381,7 @@ var Selection = function(doc) {
         // only dispatch change if the cursor actually changed
         if (cursor.row !== this.selectionLead.row || cursor.column !== this.selectionLead.column) {
             this.selectionLead = cursor;
-            this.$dispatchEvent("changeCursor", { data: this.getCursor() });
+            this._dispatchEvent("changeCursor", { data: this.getCursor() });
         }
     };
 
diff --git a/lib/ace/test/event_emitter_test.js b/lib/ace/test/event_emitter_test.js
index 2b6329f5..460b23f7 100644
--- a/lib/ace/test/event_emitter_test.js
+++ b/lib/ace/test/event_emitter_test.js
@@ -54,7 +54,7 @@ var EventEmitterTest = new TestCase("EventEmitterTest", {
            assertEquals("juhu", e.type);
         });
 
-        emitter.$dispatchEvent("juhu");
+        emitter._dispatchEvent("juhu");
         assertTrue(called);
     }
 });
diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index 5d28ff0b..e117b093 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -223,7 +223,7 @@ var VirtualRenderer = function(container, theme) {
         var pageX = event.getDocumentX(e);
         var pageY = event.getDocumentY(e);
 
-        this.$dispatchEvent("gutter" + e.type, {
+        this._dispatchEvent("gutter" + e.type, {
             row: this.screenToTextCoordinates(pageX, pageY).row,
             htmlEvent: e
         });
diff --git a/plugins/pilot/lib/canon.js b/plugins/pilot/lib/canon.js
index 7286f8a5..22f1ee4c 100644
--- a/plugins/pilot/lib/canon.js
+++ b/plugins/pilot/lib/canon.js
@@ -130,7 +130,7 @@ exports.addRequestOutput = function(request) {
         exports.requests.shiftObject();
     }
 
-    exports.$dispatchEvent('addedRequestOutput', { request: request });
+    exports._dispatchEvent('addedRequestOutput', { request: request });
 };
 
 /**
@@ -238,7 +238,7 @@ exports.Request.prototype.output = function(content) {
     }
 
     this.outputs.push(content);
-    this.$dispatchEvent('changed', {});
+    this._dispatchEvent('changed', {});
 
     return this;
 };
@@ -256,7 +256,7 @@ exports.Request.prototype.done = function(content) {
         this.output(content);
     }
 
-    this.$dispatchEvent('changed', {});
+    this._dispatchEvent('changed', {});
 };
 
 });
diff --git a/plugins/pilot/lib/event_emitter.js b/plugins/pilot/lib/event_emitter.js
index 8143cf09..a458dd43 100644
--- a/plugins/pilot/lib/event_emitter.js
+++ b/plugins/pilot/lib/event_emitter.js
@@ -37,49 +37,50 @@
 
 define(function(require, exports, module) {
 
-    var lang = require("pilot/lang").lang;
+var lang = require("pilot/lang").lang;
 
-    var EventEmitter = {};
+var EventEmitter = {};
 
-    EventEmitter.$dispatchEvent = function(eventName, e) {
-        this.$eventRegistry = this.$eventRegistry || {};
+EventEmitter._dispatchEvent = function(eventName, e) {
+    this._eventRegistry = this._eventRegistry || {};
 
-        var listeners = this.$eventRegistry[eventName];
-        if (!listeners || !listeners.length) return;
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners || !listeners.length) return;
 
-        var e = e || {};
-        e.type = eventName;
+    var e = e || {};
+    e.type = eventName;
 
-        for (var i=0; i<listeners.length; i++) {
-            listeners[i](e);
-        }
-    };
+    for (var i=0; i<listeners.length; i++) {
+        listeners[i](e);
+    }
+};
 
-    EventEmitter.on =
-    EventEmitter.addEventListener = function(eventName, callback) {
-        this.$eventRegistry = this.$eventRegistry || {};
+EventEmitter.on =
+EventEmitter.addEventListener = function(eventName, callback) {
+    this._eventRegistry = this._eventRegistry || {};
 
-        var listeners = this.$eventRegistry[eventName];
-        if (!listeners) {
-          var listeners = this.$eventRegistry[eventName] = [];
-        }
-        if (lang.arrayIndexOf(listeners, callback) == -1) {
-            listeners.push(callback);
-        }
-    };
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners) {
+      var listeners = this._eventRegistry[eventName] = [];
+    }
+    if (lang.arrayIndexOf(listeners, callback) == -1) {
+        listeners.push(callback);
+    }
+};
 
-    EventEmitter.removeEventListener = function(eventName, callback) {
-        this.$eventRegistry = this.$eventRegistry || {};
+EventEmitter.removeEventListener = function(eventName, callback) {
+    this._eventRegistry = this._eventRegistry || {};
 
-        var listeners = this.$eventRegistry[eventName];
-        if (!listeners) {
-          return;
-        }
-        var index = lang.arrayIndexOf(listeners, callback);
-        if (index !== -1) {
-            listeners.splice(index, 1);
-        }
-    };
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners) {
+      return;
+    }
+    var index = lang.arrayIndexOf(listeners, callback);
+    if (index !== -1) {
+        listeners.splice(index, 1);
+    }
+};
+
+exports.EventEmitter = EventEmitter;
 
-    exports.EventEmitter = EventEmitter;
 });
diff --git a/plugins/pilot/lib/settings.js b/plugins/pilot/lib/settings.js
index 83cfc429..d0d0210b 100644
--- a/plugins/pilot/lib/settings.js
+++ b/plugins/pilot/lib/settings.js
@@ -230,7 +230,7 @@ Settings.prototype = {
             persister.persistValue(this, key, value);
         }
 
-        this.$dispatchEvent('settingChange', { key: key, value: value });
+        this._dispatchEvent('settingChange', { key: key, value: value });
         return this;
     },