diff --git a/jsbridge/jsbridge/extension/components/jsbridge.js b/jsbridge/jsbridge/extension/components/jsbridge.js
index 631189cd..690a5cc0 100644
--- a/jsbridge/jsbridge/extension/components/jsbridge.js
+++ b/jsbridge/jsbridge/extension/components/jsbridge.js
@@ -58,7 +58,7 @@ JSBridge.prototype = {
 
         var self = this;
         var startCallback = {
-          notify: function (timer) {
+          notify: function sc_notify(timer) {
             try {
               // Try to start the JSBridge server via a socket. If we fail we
               // will try as long as we do not run into a JSBridgeTimeout and
diff --git a/mozmill/mozmill/extension/components/handlers.js b/mozmill/mozmill/extension/components/handlers.js
index 38d546e8..e0582498 100644
--- a/mozmill/mozmill/extension/components/handlers.js
+++ b/mozmill/mozmill/extension/components/handlers.js
@@ -61,7 +61,7 @@ var ConsoleObserver = {
   errorRegEx : /\[.*(Error|Exception).*(chrome|resource):\/\/(mozmill|jsbridge).*/i,
   externalFileRegEx :  /.*\.js -> file:\/\/\/.*/,
 
-  observe: function (aSubject, aTopic, aData) {
+  observe: function CO_observe(aSubject, aTopic, aData) {
     var msg = aSubject.message;
 
     // If the message is not related to one of our extensions forget about it
diff --git a/mozmill/mozmill/extension/content/test/test.js b/mozmill/mozmill/extension/content/test/test.js
index 1b9ba5b5..3bb0f634 100644
--- a/mozmill/mozmill/extension/content/test/test.js
+++ b/mozmill/mozmill/extension/content/test/test.js
@@ -2,19 +2,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
-var drop = function (event) {
+function drop(event) {
   var item = document.getElementById("item1");
   item.parentNode.removeChild(item);
 }
 
-var dragStart = function (event) {
+function dragStart(event) {
   event.dataTransfer.setData("text/test-type", "test data");
 }
 
-var dragOver = function (event) {
+function dragOver(event) {
   event.preventDefault();
 }
 
-var dragEnter = function (event) {
+function dragEnter(event) {
   event.preventDefault();
 }
diff --git a/mozmill/mozmill/extension/resource/driver/controller.js b/mozmill/mozmill/extension/resource/driver/controller.js
index c3539bcb..5e9f6b7f 100644
--- a/mozmill/mozmill/extension/resource/driver/controller.js
+++ b/mozmill/mozmill/extension/resource/driver/controller.js
@@ -81,7 +81,7 @@ waitForEvents.prototype = {
  *        Document to use for finding the menu
  *        [optional - default: aController.window.document]
  */
-var Menu = function (controller, menuSelector, document) {
+function Menu(controller, menuSelector, document) {
   this._controller = controller;
   this._menu = null;
 
@@ -237,7 +237,7 @@ Menu.prototype = {
   }
 };
 
-var MozMillController = function (window) {
+function MozMillController(window) {
   this.window = window;
 
   this.mozmillModule = {};
@@ -283,7 +283,7 @@ MozMillController.prototype.sleep = utils.sleep;
 MozMillController.prototype.waitFor = assert.waitFor;
 
 // Open the specified url in the current tab
-MozMillController.prototype.open = function (url) {
+MozMillController.prototype.open = function mc_open(url) {
   switch (this.mozmillModule.Application) {
     case "Firefox":
     case "MetroFirefox":
@@ -318,7 +318,7 @@ MozMillController.prototype.open = function (url) {
  * @returns {Object} Object which contains properties like filename, dataURL,
  *          name and timestamp of the screenshot
  */
-MozMillController.prototype.screenshot = function (node, name, save, highlights) {
+MozMillController.prototype.screenshot = function mc_screenshot(node, name, save, highlights) {
   if (!node) {
     throw new Error("node is undefined");
   }
@@ -370,7 +370,7 @@ MozMillController.prototype.screenshot = function (node, name, save, highlights)
  *
  * @param {DOMWindow} [aWindow=this.window] Window object to check for loaded state
  */
-MozMillController.prototype.isLoaded = function (aWindow) {
+MozMillController.prototype.isLoaded = function mc_isLoaded(aWindow) {
   var win = aWindow || this.window;
 
   return windows.map.getValue(utils.getWindowId(win), "loaded") || false;
@@ -388,7 +388,7 @@ MozMillController.prototype.__defineGetter__("waitForEvents", function () {
  * Wrapper function to create a new instance of a menu
  * @see Menu
  */
-MozMillController.prototype.getMenu = function (menuSelector, document) {
+MozMillController.prototype.getMenu = function mc_getMenu(menuSelector, document) {
   return new Menu(this, menuSelector, document);
 };
 
@@ -400,7 +400,7 @@ MozMillController.prototype.__defineGetter__("menus", function () {
   logDeprecated('controller.menus', 'Use controller.mainMenu instead');
 });
 
-MozMillController.prototype.waitForImage = function (aElement, timeout, interval) {
+MozMillController.prototype.waitForImage = function mc_waitForImage(aElement, timeout, interval) {
   this.waitFor(function () {
     return aElement.getNode().complete == true;
   }, "timeout exceeded for waitForImage " + aElement.getInfo(), timeout, interval);
@@ -408,7 +408,7 @@ MozMillController.prototype.waitForImage = function (aElement, timeout, interval
   broker.pass({'function':'Controller.waitForImage()'});
 }
 
-MozMillController.prototype.startUserShutdown = function (timeout, restart, next, resetProfile) {
+MozMillController.prototype.startUserShutdown = function mc_startUserShutdown(timeout, restart, next, resetProfile) {
   if (restart && resetProfile) {
     throw new Error("You can't have a user-restart and reset the profile; there is a race condition");
   }
@@ -434,7 +434,7 @@ MozMillController.prototype.startUserShutdown = function (timeout, restart, next
  *        eRestarti386 (0x20) and eRestartx86_64 (0x30) have not been documented yet.
  * @see https://developer.mozilla.org/nsIAppStartup#Attributes
  */
-MozMillController.prototype.restartApplication = function (aNext, aFlags) {
+MozMillController.prototype.restartApplication = function mc_restartApplication(aNext, aFlags) {
   var flags = Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart;
 
   if (aFlags) {
@@ -462,7 +462,7 @@ MozMillController.prototype.restartApplication = function (aNext, aFlags) {
  *        eRestarti386 and eRestartx86_64 have not been documented yet.
  * @see https://developer.mozilla.org/nsIAppStartup#Attributes
  */
-MozMillController.prototype.stopApplication = function (aResetProfile, aFlags) {
+MozMillController.prototype.stopApplication = function mc_stopApplication(aResetProfile, aFlags) {
   var flags = Ci.nsIAppStartup.eAttemptQuit;
 
   if (aFlags) {
@@ -481,21 +481,21 @@ MozMillController.prototype.stopApplication = function (aResetProfile, aFlags) {
 }
 
 //Browser navigation functions
-MozMillController.prototype.goBack = function () {
+MozMillController.prototype.goBack = function mc_goBack() {
   this.window.content.history.back();
   broker.pass({'function':'Controller.goBack()'});
 
   return true;
 }
 
-MozMillController.prototype.goForward = function () {
+MozMillController.prototype.goForward = function mc_goForward() {
   this.window.content.history.forward();
   broker.pass({'function':'Controller.goForward()'});
 
   return true;
 }
 
-MozMillController.prototype.refresh = function () {
+MozMillController.prototype.refresh = function mc_refresh() {
   this.window.content.location.reload(true);
   broker.pass({'function':'Controller.refresh()'});
 
@@ -512,7 +512,7 @@ function logDeprecatedAssert(funcName) {
                  '. Use the generic `assertion` module instead.');
 }
 
-MozMillController.prototype.assertText = function (el, text) {
+MozMillController.prototype.assertText = function mc_assertText(el, text) {
   logDeprecatedAssert("assertText");
 
   var n = el.getNode();
@@ -530,7 +530,7 @@ MozMillController.prototype.assertText = function (el, text) {
 /**
  * Assert that a specified node exists
  */
-MozMillController.prototype.assertNode = function (el) {
+MozMillController.prototype.assertNode = function mc_assertNode(el) {
   logDeprecatedAssert("assertNode");
 
   //this.window.focus();
@@ -546,7 +546,7 @@ MozMillController.prototype.assertNode = function (el) {
 /**
  * Assert that a specified node doesn't exist
  */
-MozMillController.prototype.assertNodeNotExist = function (el) {
+MozMillController.prototype.assertNodeNotExist = function mc_assertNodeNotExist(el) {
   logDeprecatedAssert("assertNodeNotExist");
 
   try {
@@ -567,7 +567,7 @@ MozMillController.prototype.assertNodeNotExist = function (el) {
 /**
  * Assert that a form element contains the expected value
  */
-MozMillController.prototype.assertValue = function (el, value) {
+MozMillController.prototype.assertValue = function mc_assertValue(el, value) {
   logDeprecatedAssert("assertValue");
 
   var n = el.getNode();
@@ -585,7 +585,7 @@ MozMillController.prototype.assertValue = function (el, value) {
 /**
  * Check if the callback function evaluates to true
  */
-MozMillController.prototype.assert = function (callback, message, thisObject) {
+MozMillController.prototype.assert = function mc_assert(callback, message, thisObject) {
   logDeprecatedAssert("assert");
 
   utils.assert(callback, message, thisObject);
@@ -597,7 +597,7 @@ MozMillController.prototype.assert = function (callback, message, thisObject) {
 /**
  * Assert that a provided value is selected in a select element
  */
-MozMillController.prototype.assertSelected = function (el, value) {
+MozMillController.prototype.assertSelected = function mc_assertSelected(el, value) {
   logDeprecatedAssert("assertSelected");
 
   var n = el.getNode();
@@ -616,7 +616,7 @@ MozMillController.prototype.assertSelected = function (el, value) {
 /**
  * Assert that a provided checkbox is checked
  */
-MozMillController.prototype.assertChecked = function (el) {
+MozMillController.prototype.assertChecked = function mc_assertChecked(el) {
   logDeprecatedAssert("assertChecked");
 
   var element = el.getNode();
@@ -633,7 +633,7 @@ MozMillController.prototype.assertChecked = function (el) {
 /**
  * Assert that a provided checkbox is not checked
  */
-MozMillController.prototype.assertNotChecked = function (el) {
+MozMillController.prototype.assertNotChecked = function mc_assertNotChecked(el) {
   logDeprecatedAssert("assertNotChecked");
 
   var element = el.getNode();
@@ -657,7 +657,7 @@ MozMillController.prototype.assertNotChecked = function (el) {
  * if val is undefined, will return true if the property exists.
  * if val is specified, will return true if the property exists and has the correct value
  */
-MozMillController.prototype.assertJSProperty = function (el, attrib, val) {
+MozMillController.prototype.assertJSProperty = function mc_assertJSProperty(el, attrib, val) {
   logDeprecatedAssert("assertJSProperty");
 
   var element = el.getNode();
@@ -686,7 +686,7 @@ MozMillController.prototype.assertJSProperty = function (el, attrib, val) {
  * if val is undefined, will return true if the property doesn't exist.
  * if val is specified, will return true if the property doesn't exist or doesn't have the specified value
  */
-MozMillController.prototype.assertNotJSProperty = function (el, attrib, val) {
+MozMillController.prototype.assertNotJSProperty = function mc_assertNotJSProperty(el, attrib, val) {
   logDeprecatedAssert("assertNotJSProperty");
 
   var element = el.getNode();
@@ -714,7 +714,7 @@ MozMillController.prototype.assertNotJSProperty = function (el, attrib, val) {
  * if val is undefined, will return true if the property exists.
  * if val is specified, will return true if the property exists and has the correct value
  */
-MozMillController.prototype.assertDOMProperty = function (el, attrib, val) {
+MozMillController.prototype.assertDOMProperty = function mc_assertDOMProperty(el, attrib, val) {
   logDeprecatedAssert("assertDOMProperty");
 
   var element = el.getNode();
@@ -746,7 +746,7 @@ MozMillController.prototype.assertDOMProperty = function (el, attrib, val) {
  * if val is undefined, will return true if the property doesn't exist.
  * if val is specified, will return true if the property doesn't exist or doesn't have the specified value
  */
-MozMillController.prototype.assertNotDOMProperty = function (el, attrib, val) {
+MozMillController.prototype.assertNotDOMProperty = function mc_assertNotDOMProperty(el, attrib, val) {
   logDeprecatedAssert("assertNotDOMProperty");
 
   var element = el.getNode();
@@ -776,7 +776,7 @@ MozMillController.prototype.assertNotDOMProperty = function (el, attrib, val) {
  * Assert that a specified image has actually loaded. The Safari workaround results
  * in additional requests for broken images (in Safari only) but works reliably
  */
-MozMillController.prototype.assertImageLoaded = function (el) {
+MozMillController.prototype.assertImageLoaded = function mc_assertImageLoaded(el) {
   logDeprecatedAssert("assertImageLoaded");
 
   var img = el.getNode();
@@ -828,7 +828,7 @@ MozMillController.prototype.assertImageLoaded = function (el) {
 /**
  * Drag one element to the top x,y coords of another specified element
  */
-MozMillController.prototype.mouseMove = function (doc, start, dest) {
+MozMillController.prototype.mouseMove = function mc_mouseMove(doc, start, dest) {
   // if one of these elements couldn't be looked up
   if (typeof start != 'object'){
     throw new Error("received bad coordinates");
@@ -838,7 +838,7 @@ MozMillController.prototype.mouseMove = function (doc, start, dest) {
     throw new Error("received bad coordinates");
   }
 
-  var triggerMouseEvent = function (element, clientX, clientY) {
+  function triggerMouseEvent(element, clientX, clientY) {
     clientX = clientX ? clientX: 0;
     clientY = clientY ? clientY: 0;
 
@@ -889,9 +889,9 @@ MozMillController.prototype.mouseMove = function (doc, start, dest) {
  *
  * @returns {String} the captured dropEffect
  */
-MozMillController.prototype.dragToElement = function (aSrc, aDest, aOffsetX,
-                                                      aOffsetY, aSourceWindow,
-                                                      aDropEffect, aDragData) {
+MozMillController.prototype.dragToElement = function mc_dragToElement(aSrc, aDest, aOffsetX,
+                                                                      aOffsetY, aSourceWindow,
+                                                                      aDropEffect, aDragData) {
   logDeprecated("controller.dragToElement", "Use the MozMillElement object.");
   return aSrc.dragToElement(aDest, aOffsetX, aOffsetY, aSourceWindow, null,
                             aDropEffect, aDragData);
@@ -901,7 +901,7 @@ function Tabs(controller) {
   this.controller = controller;
 }
 
-Tabs.prototype.getTab = function (index) {
+Tabs.prototype.getTab = function Tabs_getTab(index) {
   return this.controller.browserObject.browsers[index].contentDocument;
 }
 
@@ -909,11 +909,11 @@ Tabs.prototype.__defineGetter__("activeTab", function () {
   return this.controller.browserObject.selectedBrowser.contentDocument;
 });
 
-Tabs.prototype.selectTab = function (index) {
+Tabs.prototype.selectTab = function Tabs_selectTab(index) {
   // GO in to tab manager and grab the tab by index and call focus.
 }
 
-Tabs.prototype.findWindow = function (doc) {
+Tabs.prototype.findWindow = function Tabs_findWindow(doc) {
   for (var i = 0; i <= (this.controller.window.frames.length - 1); i++) {
     if (this.controller.window.frames[i].document == doc) {
       return this.controller.window.frames[i];
@@ -923,7 +923,7 @@ Tabs.prototype.findWindow = function (doc) {
   throw new Error("Cannot find window for document. Doc title == " + doc.title);
 }
 
-Tabs.prototype.getTabWindow = function (index) {
+Tabs.prototype.getTabWindow = function Tabs_getTabWindow(index) {
   return this.findWindow(this.getTab(index));
 }
 
@@ -947,7 +947,7 @@ Tabs.prototype.__defineGetter__("activeTabIndex", function () {
   }
 });
 
-Tabs.prototype.selectTabIndex = function (aIndex) {
+Tabs.prototype.selectTabIndex = function Tabs_selectTabIndex(aIndex) {
   var browser = this.controller.browserObject;
 
   switch(this.controller.mozmillModule.Application) {
@@ -963,7 +963,8 @@ Tabs.prototype.selectTabIndex = function (aIndex) {
 function browserAdditions (controller) {
   controller.tabs = new Tabs(controller);
 
-  controller.waitForPageLoad = function (aDocument, aTimeout, aInterval) {
+  controller.waitForPageLoad = function controller_waitForPageLoad(aDocument,
+                                                                   aTimeout, aInterval) {
     var timeout = aTimeout || 30000;
     var win = null;
     var timed_out = false;
@@ -1015,13 +1016,13 @@ var controllerAdditions = {
  *
  * The following methods have all been DEPRECATED as of Mozmill 2.0
  */
-MozMillController.prototype.assertProperty = function (el, attrib, val) {
+MozMillController.prototype.assertProperty = function mc_assertProperty(el, attrib, val) {
   logDeprecatedAssert("assertProperty");
 
   return this.assertJSProperty(el, attrib, val);
 };
 
-MozMillController.prototype.assertPropertyNotExist = function (el, attrib) {
+MozMillController.prototype.assertPropertyNotExist = function mc_assertPropertyNotExist(el, attrib) {
   logDeprecatedAssert("assertPropertyNotExist");
   return this.assertNotJSProperty(el, attrib);
 };
@@ -1032,13 +1033,13 @@ MozMillController.prototype.assertPropertyNotExist = function (el, attrib) {
  * The following methods have all been DEPRECATED as of Mozmill 2.0
  * Use the MozMillElement object instead (https://developer.mozilla.org/en/Mozmill/Mozmill_Element_Object)
  */
-MozMillController.prototype.select = function (aElement, index, option, value) {
+MozMillController.prototype.select = function mc_select(aElement, index, option, value) {
   logDeprecated("controller.select", "Use the MozMillElement object.");
 
   return aElement.select(index, option, value);
 };
 
-MozMillController.prototype.keypress = function (aElement, aKey, aModifiers, aExpectedEvent) {
+MozMillController.prototype.keypress = function mc_keypress(aElement, aKey, aModifiers, aExpectedEvent) {
   logDeprecated("controller.keypress", "Use the MozMillElement object.");
 
   if (!aElement) {
@@ -1048,7 +1049,7 @@ MozMillController.prototype.keypress = function (aElement, aKey, aModifiers, aEx
   return aElement.keypress(aKey, aModifiers, aExpectedEvent);
 }
 
-MozMillController.prototype.type = function (aElement, aText, aExpectedEvent) {
+MozMillController.prototype.type = function mc_type(aElement, aText, aExpectedEvent) {
   logDeprecated("controller.type", "Use the MozMillElement object.");
 
   if (!aElement) {
@@ -1065,85 +1066,86 @@ MozMillController.prototype.type = function (aElement, aText, aExpectedEvent) {
   return retval;
 }
 
-MozMillController.prototype.mouseEvent = function (aElement, aOffsetX, aOffsetY, aEvent, aExpectedEvent) {
+MozMillController.prototype.mouseEvent = function mc_mouseEvent(aElement, aOffsetX, aOffsetY, aEvent, aExpectedEvent) {
   logDeprecated("controller.mouseEvent", "Use the MozMillElement object.");
 
   return aElement.mouseEvent(aOffsetX, aOffsetY, aEvent, aExpectedEvent);
 }
 
-MozMillController.prototype.click = function (aElement, left, top, expectedEvent) {
+MozMillController.prototype.click = function mc_click(aElement, left, top, expectedEvent) {
   logDeprecated("controller.click", "Use the MozMillElement object.");
 
   return aElement.click(left, top, expectedEvent);
 }
 
-MozMillController.prototype.doubleClick = function (aElement, left, top, expectedEvent) {
+MozMillController.prototype.doubleClick = function mc_doubleClick(aElement, left, top, expectedEvent) {
   logDeprecated("controller.doubleClick", "Use the MozMillElement object.");
 
   return aElement.doubleClick(left, top, expectedEvent);
 }
 
-MozMillController.prototype.mouseDown = function (aElement, button, left, top, expectedEvent) {
+MozMillController.prototype.mouseDown = function mc_mouseDown(aElement, button, left, top, expectedEvent) {
   logDeprecated("controller.mouseDown", "Use the MozMillElement object.");
 
   return aElement.mouseDown(button, left, top, expectedEvent);
 };
 
-MozMillController.prototype.mouseOut = function (aElement, button, left, top, expectedEvent) {
+MozMillController.prototype.mouseOut = function mc_mouseOut(aElement, button, left, top, expectedEvent) {
   logDeprecated("controller.mouseOut", "Use the MozMillElement object.");
 
   return aElement.mouseOut(button, left, top, expectedEvent);
 };
 
-MozMillController.prototype.mouseOver = function (aElement, button, left, top, expectedEvent) {
+MozMillController.prototype.mouseOver = function mc_mouseOver(aElement, button, left, top, expectedEvent) {
   logDeprecated("controller.mouseOver", "Use the MozMillElement object.");
 
   return aElement.mouseOver(button, left, top, expectedEvent);
 };
 
-MozMillController.prototype.mouseUp = function (aElement, button, left, top, expectedEvent) {
+MozMillController.prototype.mouseUp = function mc_mouseUp(aElement, button, left, top, expectedEvent) {
   logDeprecated("controller.mouseUp", "Use the MozMillElement object.");
 
   return aElement.mouseUp(button, left, top, expectedEvent);
 };
 
-MozMillController.prototype.middleClick = function (aElement, left, top, expectedEvent) {
+MozMillController.prototype.middleClick = function mc_middleClick(aElement, left, top, expectedEvent) {
   logDeprecated("controller.middleClick", "Use the MozMillElement object.");
 
   return aElement.middleClick(aElement, left, top, expectedEvent);
 }
 
-MozMillController.prototype.rightClick = function (aElement, left, top, expectedEvent) {
+MozMillController.prototype.rightClick = function mc_rightClick(aElement, left, top, expectedEvent) {
   logDeprecated("controller.rightClick", "Use the MozMillElement object.");
 
   return aElement.rightClick(left, top, expectedEvent);
 }
 
-MozMillController.prototype.check = function (aElement, state) {
+MozMillController.prototype.check = function mc_check(aElement, state) {
   logDeprecated("controller.check", "Use the MozMillElement object.");
 
   return aElement.check(state);
 }
 
-MozMillController.prototype.radio = function (aElement) {
+MozMillController.prototype.radio = function mc_radio(aElement) {
   logDeprecated("controller.radio", "Use the MozMillElement object.");
 
   return aElement.select();
 }
 
-MozMillController.prototype.waitThenClick = function (aElement, timeout, interval) {
+MozMillController.prototype.waitThenClick = function mc_waitThenClick(aElement, timeout, interval) {
   logDeprecated("controller.waitThenClick", "Use the MozMillElement object.");
 
   return aElement.waitThenClick(timeout, interval);
 }
 
-MozMillController.prototype.waitForElement = function (aElement, timeout, interval) {
+MozMillController.prototype.waitForElement = function mc_waitForElement(aElement, timeout, interval) {
   logDeprecated("controller.waitForElement", "Use the MozMillElement object.");
 
   return aElement.waitForElement(timeout, interval);
 }
 
-MozMillController.prototype.waitForElementNotPresent = function (aElement, timeout, interval) {
+MozMillController.prototype.waitForElementNotPresent = function mc_waitForElementNotPresent(aElement,
+                                                                                            timeout, interval) {
   logDeprecated("controller.waitForElementNotPresent", "Use the MozMillElement object.");
 
   return aElement.waitForElementNotPresent(timeout, interval);
diff --git a/mozmill/mozmill/extension/resource/driver/elementslib.js b/mozmill/mozmill/extension/resource/driver/elementslib.js
index f08cf42f..6578f1af 100644
--- a/mozmill/mozmill/extension/resource/driver/elementslib.js
+++ b/mozmill/mozmill/extension/resource/driver/elementslib.js
@@ -20,7 +20,7 @@ var withs = {}; Cu.import('resource://mozmill/stdlib/withs.js', withs);
 var dom = {}; Cu.import('resource://mozmill/stdlib/dom.js', dom);
 var objects = {}; Cu.import('resource://mozmill/stdlib/objects.js', objects);
 
-var countQuotes = function (str) {
+function countQuotes(str) {
   var count = 0;
   var i = 0;
 
@@ -43,7 +43,7 @@ var countQuotes = function (str) {
  * Takes a lookup string as input and returns
  * a list of each node in the string
  */
-var smartSplit = function (str) {
+function smartSplit(str) {
   // Ensure we have an even number of quotes
   if (countQuotes(str) % 2 != 0) {
     throw new Error ("Invalid Lookup Expression");
@@ -102,7 +102,7 @@ function nodeSearch(doc, func, string) {
   var element = null;
 
   //inline function to recursively find the element in the DOM, cross frame.
-  var search = function (win, func, string) {
+   function search(win, func, string) {
     if (win == null) {
       return;
     }
@@ -180,7 +180,7 @@ function Link(_document, linkName) {
   }
 
   this.getNodeForDocument = function (linkName) {
-    var getText = function (el) {
+     function getText(el) {
       var text = "";
 
       if (el.nodeType == 3) { //textNode
@@ -291,7 +291,7 @@ function Name(_document, nName) {
 };
 
 
-var _returnResult = function (results) {
+function _returnResult(results) {
   if (results.length == 0) {
     return null
   }
@@ -302,7 +302,7 @@ var _returnResult = function (results) {
   }
 }
 
-var _forChildren = function (element, name, value) {
+function _forChildren(element, name, value) {
   var results = [];
   var nodes = [e for each (e in element.childNodes) if (e)]
 
@@ -316,7 +316,7 @@ var _forChildren = function (element, name, value) {
   return results;
 }
 
-var _forAnonChildren = function (_document, element, name, value) {
+function _forAnonChildren(_document, element, name, value) {
   var results = [];
   var nodes = [e for each (e in _document.getAnoymousNodes(element)) if (e)];
 
@@ -330,15 +330,15 @@ var _forAnonChildren = function (_document, element, name, value) {
   return results;
 }
 
-var _byID = function (_document, parent, value) {
+function _byID(_document, parent, value) {
   return _returnResult(_forChildren(parent, 'id', value));
 }
 
-var _byName = function (_document, parent, value) {
+function _byName(_document, parent, value) {
   return _returnResult(_forChildren(parent, 'tagName', value));
 }
 
-var _byAttrib = function (parent, attributes) {
+function _byAttrib(parent, attributes) {
   var results = [];
   var nodes = parent.childNodes;
 
@@ -366,7 +366,7 @@ var _byAttrib = function (parent, attributes) {
   return _returnResult(results)
 }
 
-var _byAnonAttrib = function (_document, parent, attributes) {
+function _byAnonAttrib(_document, parent, attributes) {
   var results = [];
 
   if (objects.getLength(attributes) == 1) {
@@ -410,7 +410,7 @@ var _byAnonAttrib = function (_document, parent, attributes) {
   return _returnResult(results)
 }
 
-var _byIndex = function (_document, parent, i) {
+function _byIndex(_document, parent, i) {
   if (parent instanceof Array) {
     return parent[i];
   }
@@ -418,15 +418,15 @@ var _byIndex = function (_document, parent, i) {
   return parent.childNodes[i];
 }
 
-var _anonByName = function (_document, parent, value) {
+function _anonByName(_document, parent, value) {
   return _returnResult(_forAnonChildren(_document, parent, 'tagName', value));
 }
 
-var _anonByAttrib = function (_document, parent, value) {
+function _anonByAttrib(_document, parent, value) {
   return _byAnonAttrib(_document, parent, value);
 }
 
-var _anonByIndex = function (_document, parent, i) {
+function _anonByIndex(_document, parent, i) {
   return _document.getAnonymousNodes(parent)[i];
 }
 
@@ -455,7 +455,7 @@ function Lookup(_document, expression) {
    *
    * @returns {Object} Node found by the given expression
    */
-  var reduceLookup = function (parentNode, exp) {
+   function reduceLookup(parentNode, exp) {
     // Abort in case the parent node was not found
     if (!parentNode) {
       return false;
diff --git a/mozmill/mozmill/extension/resource/driver/mozelement.js b/mozmill/mozmill/extension/resource/driver/mozelement.js
index 4fa0592c..5f2a1e0d 100644
--- a/mozmill/mozmill/extension/resource/driver/mozelement.js
+++ b/mozmill/mozmill/extension/resource/driver/mozelement.js
@@ -51,31 +51,31 @@ function createInstance(locatorType, locator, elem, document) {
   throw new Error("Unsupported element type " + locatorType + ": " + locator);
 }
 
-var Elem = function (node) {
+function Elem(node) {
   return createInstance("Elem", node, node);
 };
 
-var Selector = function (document, selector, index) {
+function Selector(document, selector, index) {
   return createInstance("Selector", selector, elementslib.Selector(document, selector, index), document);
 };
 
-var ID = function (document, nodeID) {
+function ID(document, nodeID) {
   return createInstance("ID", nodeID, elementslib.ID(document, nodeID), document);
 };
 
-var Link = function (document, linkName) {
+function Link(document, linkName) {
   return createInstance("Link", linkName, elementslib.Link(document, linkName), document);
 };
 
-var XPath = function (document, expr) {
+function XPath(document, expr) {
   return createInstance("XPath", expr, elementslib.XPath(document, expr), document);
 };
 
-var Name = function (document, nName) {
+function Name(document, nName) {
   return createInstance("Name", nName, elementslib.Name(document, nName), document);
 };
 
-var Lookup = function (document, expression) {
+function Lookup(document, expression) {
   var elem = createInstance("Lookup", expression, elementslib.Lookup(document, expression), document);
 
   // Bug 864268 - Expose the expression property to maintain backwards compatibility
@@ -103,7 +103,7 @@ function MozMillElement(locatorType, locator, args) {
 }
 
 // Static method that returns true if node is of this element type
-MozMillElement.isType = function (node) {
+MozMillElement.isType = function me_isType(node) {
   return true;
 };
 
@@ -154,9 +154,9 @@ MozMillElement.prototype.__defineGetter__("element", function () {
  *
  * @returns {String} the captured dropEffect
  */
-MozMillElement.prototype.dragToElement = function(aElement, aOffsetX, aOffsetY,
-                                                  aSourceWindow, aDestWindow,
-                                                  aDropEffect, aDragData) {
+MozMillElement.prototype.dragToElement = function me_dragToElement(aElement, aOffsetX, aOffsetY,
+                                                                   aSourceWindow, aDestWindow,
+                                                                   aDropEffect, aDragData) {
   if (!this.element) {
     throw new Error("Could not find element " + this.getInfo());
   }
@@ -238,11 +238,11 @@ MozMillElement.prototype.dragToElement = function(aElement, aOffsetX, aOffsetY,
 };
 
 // Returns the actual wrapped DOM node
-MozMillElement.prototype.getNode = function () {
+MozMillElement.prototype.getNode = function me_getNode() {
   return this.element;
 };
 
-MozMillElement.prototype.getInfo = function () {
+MozMillElement.prototype.getInfo = function me_getInfo() {
   return this._locatorType + ": " + this._locator;
 };
 
@@ -250,7 +250,7 @@ MozMillElement.prototype.getInfo = function () {
  * Sometimes an element which once existed will no longer exist in the DOM
  * This function re-searches for the element
  */
-MozMillElement.prototype.exists = function () {
+MozMillElement.prototype.exists = function me_exists() {
   this._element = undefined;
   if (this.element) {
     return true;
@@ -283,7 +283,7 @@ MozMillElement.prototype.exists = function () {
  *                               [optional - default: current element]
  *                  type       - Type of the expected key event
  */
-MozMillElement.prototype.keypress = function (aKey, aModifiers, aExpectedEvent) {
+MozMillElement.prototype.keypress = function me_keypress(aKey, aModifiers, aExpectedEvent) {
   if (!this.element) {
     throw new Error("Could not find element " + this.getInfo());
   }
@@ -343,7 +343,7 @@ MozMillElement.prototype.keypress = function (aKey, aModifiers, aExpectedEvent)
  *                               [optional - default: current element]
  *                  type       - Type of the expected mouse event
  */
-MozMillElement.prototype.mouseEvent = function (aOffsetX, aOffsetY, aEvent, aExpectedEvent) {
+MozMillElement.prototype.mouseEvent = function me_mouseEvent(aOffsetX, aOffsetY, aEvent, aExpectedEvent) {
   if (!this.element) {
     throw new Error(arguments.callee.name + ": could not find element " + this.getInfo());
   }
@@ -400,7 +400,7 @@ MozMillElement.prototype.mouseEvent = function (aOffsetX, aOffsetY, aEvent, aExp
 /**
  * Synthesize a mouse click event on the given element
  */
-MozMillElement.prototype.click = function (aOffsetX, aOffsetY, aExpectedEvent) {
+MozMillElement.prototype.click = function me_click(aOffsetX, aOffsetY, aExpectedEvent) {
   // Handle menu items differently
   if (this.element && this.element.tagName == "menuitem") {
     this.element.click();
@@ -416,7 +416,7 @@ MozMillElement.prototype.click = function (aOffsetX, aOffsetY, aExpectedEvent) {
 /**
  * Synthesize a double click on the given element
  */
-MozMillElement.prototype.doubleClick = function (aOffsetX, aOffsetY, aExpectedEvent) {
+MozMillElement.prototype.doubleClick = function me_doubleClick(aOffsetX, aOffsetY, aExpectedEvent) {
   this.mouseEvent(aOffsetX, aOffsetY, {clickCount: 2}, aExpectedEvent);
 
   broker.pass({'function':'MozMillElement.doubleClick()'});
@@ -427,7 +427,7 @@ MozMillElement.prototype.doubleClick = function (aOffsetX, aOffsetY, aExpectedEv
 /**
  * Synthesize a mouse down event on the given element
  */
-MozMillElement.prototype.mouseDown = function (aButton, aOffsetX, aOffsetY, aExpectedEvent) {
+MozMillElement.prototype.mouseDown = function me_mouseDown(aButton, aOffsetX, aOffsetY, aExpectedEvent) {
   this.mouseEvent(aOffsetX, aOffsetY, {button: aButton, type: "mousedown"}, aExpectedEvent);
 
   broker.pass({'function':'MozMillElement.mouseDown()'});
@@ -438,7 +438,7 @@ MozMillElement.prototype.mouseDown = function (aButton, aOffsetX, aOffsetY, aExp
 /**
  * Synthesize a mouse out event on the given element
  */
-MozMillElement.prototype.mouseOut = function (aButton, aOffsetX, aOffsetY, aExpectedEvent) {
+MozMillElement.prototype.mouseOut = function me_mouseOut(aButton, aOffsetX, aOffsetY, aExpectedEvent) {
   this.mouseEvent(aOffsetX, aOffsetY, {button: aButton, type: "mouseout"}, aExpectedEvent);
 
   broker.pass({'function':'MozMillElement.mouseOut()'});
@@ -449,7 +449,7 @@ MozMillElement.prototype.mouseOut = function (aButton, aOffsetX, aOffsetY, aExpe
 /**
  * Synthesize a mouse over event on the given element
  */
-MozMillElement.prototype.mouseOver = function (aButton, aOffsetX, aOffsetY, aExpectedEvent) {
+MozMillElement.prototype.mouseOver = function me_mouseOver(aButton, aOffsetX, aOffsetY, aExpectedEvent) {
   this.mouseEvent(aOffsetX, aOffsetY, {button: aButton, type: "mouseover"}, aExpectedEvent);
 
   broker.pass({'function':'MozMillElement.mouseOver()'});
@@ -460,7 +460,7 @@ MozMillElement.prototype.mouseOver = function (aButton, aOffsetX, aOffsetY, aExp
 /**
  * Synthesize a mouse up event on the given element
  */
-MozMillElement.prototype.mouseUp = function (aButton, aOffsetX, aOffsetY, aExpectedEvent) {
+MozMillElement.prototype.mouseUp = function me_mouseUp(aButton, aOffsetX, aOffsetY, aExpectedEvent) {
   this.mouseEvent(aOffsetX, aOffsetY, {button: aButton, type: "mouseup"}, aExpectedEvent);
 
   broker.pass({'function':'MozMillElement.mouseUp()'});
@@ -471,7 +471,7 @@ MozMillElement.prototype.mouseUp = function (aButton, aOffsetX, aOffsetY, aExpec
 /**
  * Synthesize a mouse middle click event on the given element
  */
-MozMillElement.prototype.middleClick = function (aOffsetX, aOffsetY, aExpectedEvent) {
+MozMillElement.prototype.middleClick = function me_middleClick(aOffsetX, aOffsetY, aExpectedEvent) {
   this.mouseEvent(aOffsetX, aOffsetY, {button: 1}, aExpectedEvent);
 
   broker.pass({'function':'MozMillElement.middleClick()'});
@@ -482,7 +482,7 @@ MozMillElement.prototype.middleClick = function (aOffsetX, aOffsetY, aExpectedEv
 /**
  * Synthesize a mouse right click event on the given element
  */
-MozMillElement.prototype.rightClick = function (aOffsetX, aOffsetY, aExpectedEvent) {
+MozMillElement.prototype.rightClick = function me_rightClick(aOffsetX, aOffsetY, aExpectedEvent) {
   this.mouseEvent(aOffsetX, aOffsetY, {type : "contextmenu", button: 2 }, aExpectedEvent);
 
   broker.pass({'function':'MozMillElement.rightClick()'});
@@ -549,7 +549,7 @@ MozMillElement.prototype.rightClick = function (aOffsetX, aOffsetY, aExpectedEve
  *        different target. To be careful, you should use the target associated
  *        with individual touches
  */
-MozMillElement.prototype.touchEvent = function (aOffsetX, aOffsetY, aEvent) {
+MozMillElement.prototype.touchEvent = function me_touchEvent(aOffsetX, aOffsetY, aEvent) {
   if (!this.element) {
     throw new Error(arguments.callee.name + ": could not find element " + this.getInfo());
   }
@@ -593,7 +593,7 @@ MozMillElement.prototype.touchEvent = function (aOffsetX, aOffsetY, aEvent) {
  * @param {MozMillElement} [aExpectedEvent.type]
  *        Type of the expected mouse event
  */
-MozMillElement.prototype.tap = function (aOffsetX, aOffsetY, aExpectedEvent) {
+MozMillElement.prototype.tap = function me_tap(aOffsetX, aOffsetY, aExpectedEvent) {
   this.mouseEvent(aOffsetX, aOffsetY, {
     clickCount: 1,
     inputSource: Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH
@@ -618,7 +618,7 @@ MozMillElement.prototype.tap = function (aOffsetX, aOffsetY, aExpectedEvent) {
  * @param {MozMillElement} [aExpectedEvent.type]
  *        Type of the expected mouse event
  */
-MozMillElement.prototype.doubleTap = function (aOffsetX, aOffsetY, aExpectedEvent) {
+MozMillElement.prototype.doubleTap = function me_doubleTap(aOffsetX, aOffsetY, aExpectedEvent) {
   this.mouseEvent(aOffsetX, aOffsetY, {
     clickCount: 2,
     inputSource: Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH
@@ -639,7 +639,7 @@ MozMillElement.prototype.doubleTap = function (aOffsetX, aOffsetY, aExpectedEven
  * @param {Number} [aTime=1000]
  *        Duration of the "press" event in ms
  */
-MozMillElement.prototype.longPress = function (aOffsetX, aOffsetY, aTime) {
+MozMillElement.prototype.longPress = function me_longPress(aOffsetX, aOffsetY, aTime) {
   var time = aTime || 1000;
 
   this.touchStart(aOffsetX, aOffsetY);
@@ -663,7 +663,7 @@ MozMillElement.prototype.longPress = function (aOffsetX, aOffsetY, aTime) {
  * @param {Number} aOffsetY2
  *        Top offset of the end position
  */
-MozMillElement.prototype.touchDrag = function (aOffsetX1, aOffsetY1, aOffsetX2, aOffsetY2) {
+MozMillElement.prototype.touchDrag = function me_touchDrag(aOffsetX1, aOffsetY1, aOffsetX2, aOffsetY2) {
   this.touchStart(aOffsetX1, aOffsetY1);
   this.touchMove(aOffsetX2, aOffsetY2);
   this.touchEnd(aOffsetX2, aOffsetY2);
@@ -681,7 +681,7 @@ MozMillElement.prototype.touchDrag = function (aOffsetX1, aOffsetY1, aOffsetX2,
  * @param {Number} aOffsetY
  *        Top offset where the event is triggered
  */
-MozMillElement.prototype.touchStart = function (aOffsetX, aOffsetY) {
+MozMillElement.prototype.touchStart = function me_touchStart(aOffsetX, aOffsetY) {
   this.touchEvent(aOffsetX, aOffsetY, { type: "touchstart" });
 
   broker.pass({'function':'MozMillElement.touchStart()'});
@@ -697,7 +697,7 @@ MozMillElement.prototype.touchStart = function (aOffsetX, aOffsetY) {
  * @param {Number} aOffsetY
  *        Top offset where the event is triggered
  */
-MozMillElement.prototype.touchEnd = function (aOffsetX, aOffsetY) {
+MozMillElement.prototype.touchEnd = function me_touchEnd(aOffsetX, aOffsetY) {
   this.touchEvent(aOffsetX, aOffsetY, { type: "touchend" });
 
   broker.pass({'function':'MozMillElement.touchEnd()'});
@@ -713,7 +713,7 @@ MozMillElement.prototype.touchEnd = function (aOffsetX, aOffsetY) {
  * @param {Number} aOffsetY
  *        Top offset where the event is triggered
  */
-MozMillElement.prototype.touchMove = function (aOffsetX, aOffsetY) {
+MozMillElement.prototype.touchMove = function me_touchMove(aOffsetX, aOffsetY) {
   this.touchEvent(aOffsetX, aOffsetY, { type: "touchmove" });
 
   broker.pass({'function':'MozMillElement.touchMove()'});
@@ -721,7 +721,7 @@ MozMillElement.prototype.touchMove = function (aOffsetX, aOffsetY) {
   return true;
 };
 
-MozMillElement.prototype.waitForElement = function (timeout, interval) {
+MozMillElement.prototype.waitForElement = function me_waitForElement(timeout, interval) {
   var elem = this;
 
   assert.waitFor(function () {
@@ -732,7 +732,7 @@ MozMillElement.prototype.waitForElement = function (timeout, interval) {
   broker.pass({'function':'MozMillElement.waitForElement()'});
 };
 
-MozMillElement.prototype.waitForElementNotPresent = function (timeout, interval) {
+MozMillElement.prototype.waitForElementNotPresent = function me_waitForElementNotPresent(timeout, interval) {
   var elem = this;
 
   assert.waitFor(function () {
@@ -743,8 +743,8 @@ MozMillElement.prototype.waitForElementNotPresent = function (timeout, interval)
   broker.pass({'function':'MozMillElement.waitForElementNotPresent()'});
 };
 
-MozMillElement.prototype.waitThenClick = function (timeout, interval,
-                                                   aOffsetX, aOffsetY, aExpectedEvent) {
+MozMillElement.prototype.waitThenClick = function me_waitThenClick(timeout, interval,
+                                                                   aOffsetX, aOffsetY, aExpectedEvent) {
   this.waitForElement(timeout, interval);
   this.click(aOffsetX, aOffsetY, aExpectedEvent);
 };
@@ -767,14 +767,14 @@ MozMillElement.prototype.waitThenClick = function (timeout, interval,
  * @param {MozMillElement} [aExpectedEvent.type]
  *        Type of the expected mouse event
  */
-MozMillElement.prototype.waitThenTap = function (aTimeout, aInterval,
-                                                 aOffsetX, aOffsetY, aExpectedEvent) {
+MozMillElement.prototype.waitThenTap = function me_waitThenTap(aTimeout, aInterval,
+                                                               aOffsetX, aOffsetY, aExpectedEvent) {
   this.waitForElement(aTimeout, aInterval);
   this.tap(aOffsetX, aOffsetY, aExpectedEvent);
 };
 
 // Dispatches an HTMLEvent
-MozMillElement.prototype.dispatchEvent = function (eventType, canBubble, modifiers) {
+MozMillElement.prototype.dispatchEvent = function me_dispatchEvent(eventType, canBubble, modifiers) {
   canBubble = canBubble || true;
   modifiers = modifiers || { };
 
diff --git a/mozmill/mozmill/extension/resource/driver/mozmill.js b/mozmill/mozmill/extension/resource/driver/mozmill.js
index 283c9bfb..292749e1 100644
--- a/mozmill/mozmill/extension/resource/driver/mozmill.js
+++ b/mozmill/mozmill/extension/resource/driver/mozmill.js
@@ -257,18 +257,18 @@ function timer (name) {
   frame.timers.push(this);
 }
 
-timer.prototype.start = function (name) {
+timer.prototype.start = function timer_start(name) {
   this.timers[name].startTime = (new Date).getTime();
 }
 
-timer.prototype.stop = function (name) {
+timer.prototype.stop = function timer_stop(name) {
   var t = this.timers[name];
 
   t.endTime = (new Date).getTime();
   t.totalTime = (t.endTime - t.startTime);
 }
 
-timer.prototype.end = function () {
+timer.prototype.end = function timer_end() {
   frame.events.fireEvent("timer", this);
   frame.timers.remove(this);
 }
diff --git a/mozmill/mozmill/extension/resource/modules/assertions.js b/mozmill/mozmill/extension/resource/modules/assertions.js
index b4950205..15962495 100644
--- a/mozmill/mozmill/extension/resource/modules/assertions.js
+++ b/mozmill/mozmill/extension/resource/modules/assertions.js
@@ -53,7 +53,7 @@ Assert.prototype = {
   // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-  _deepEqual: function (actual, expected) {
+  _deepEqual: function Assert__deepEqual(actual, expected) {
     // 7.1. All identical values are equivalent, as determined by ===.
     if (actual === expected) {
       return true;
@@ -79,7 +79,7 @@ Assert.prototype = {
     }
   },
 
-  _objEquiv: function (a, b) {
+  _objEquiv: function Assert__objEquiv(a, b) {
     if (a == null || a == undefined || b == null || b == undefined)
       return false;
     // an identical 'prototype' property.
diff --git a/mozmill/mozmill/extension/resource/modules/frame.js b/mozmill/mozmill/extension/resource/modules/frame.js
index fffc0546..5d07a364 100644
--- a/mozmill/mozmill/extension/resource/modules/frame.js
+++ b/mozmill/mozmill/extension/resource/modules/frame.js
@@ -67,7 +67,7 @@ function shutdownApplication(aFlags) {
   // Use a timer to trigger the application restart, which will allow us to
   // send an ACK packet via jsbridge if the method has been called via Python.
   var event = {
-    notify: function(timer) {
+    notify: function event_notify(timer) {
       Services.startup.quit(flags);
     }
   }
@@ -113,18 +113,18 @@ var events = {
   globalListeners : []
 }
 
-events.setState = function (v) {
+events.setState = function events_setState(v) {
   return stateChangeBase(['dependencies', 'setupModule', 'teardownModule',
                           'test', 'setupTest', 'teardownTest', 'collection'],
                           null, 'currentState', 'setState', v);
 }
 
-events.toggleUserShutdown = function (obj){
+events.toggleUserShutdown = function events_toggleUserShutdown(obj){
   if (!this.userShutdown) {
     this.userShutdown = obj;
 
     var event = {
-      notify: function(timer) {
+      notify: function event_notify(timer) {
        events.toggleUserShutdown(obj);
       }
     }
@@ -152,15 +152,15 @@ events.toggleUserShutdown = function (obj){
   }
 }
 
-events.isUserShutdown = function () {
+events.isUserShutdown = function events_isUserShutdown() {
   return this.userShutdown ? this.userShutdown["user"] : false;
 }
 
-events.isRestartShutdown = function () {
+events.isRestartShutdown = function events_isRestartShutdown() {
   return this.userShutdown.restart;
 }
 
-events.startShutdown = function (obj) {
+events.startShutdown = function events_startShutdown(obj) {
   events.fireEvent('shutdown', obj);
 
   if (obj["user"]) {
@@ -170,7 +170,7 @@ events.startShutdown = function (obj) {
   }
 }
 
-events.setTest = function (test) {
+events.setTest = function events_setTest(test) {
   test.__start__ = Date.now();
   test.__passes__ = [];
   test.__fails__ = [];
@@ -182,7 +182,7 @@ events.setTest = function (test) {
   events.fireEvent('setTest', obj);
 }
 
-events.endTest = function (test) {
+events.endTest = function events_endTest(test) {
   // use the current test unless specified
   if (test === undefined) {
     test = events.currentTest;
@@ -221,7 +221,7 @@ events.endTest = function (test) {
   }
 }
 
-events.setModule = function (aModule) {
+events.setModule = function events_setModule(aModule) {
   aModule.__start__ = Date.now();
   aModule.__status__ = 'running';
 
@@ -232,7 +232,7 @@ events.setModule = function (aModule) {
   return result;
 }
 
-events.endModule = function (aModule) {
+events.endModule = function events_endModule(aModule) {
   // It should only reported once, so check if it already has been done
   if (aModule.__status__ === 'done')
     return;
@@ -249,7 +249,7 @@ events.endModule = function (aModule) {
   events.fireEvent('endModule', obj);
 }
 
-events.pass = function (obj) {
+events.pass = function events_pass(obj) {
   // a low level event, such as a keystroke, succeeds
   if (events.currentTest) {
     events.currentTest.__passes__.push(obj);
@@ -266,7 +266,7 @@ events.pass = function (obj) {
   events.fireEvent('pass', obj);
 }
 
-events.fail = function (obj) {
+events.fail = function events_fail(obj) {
   var error = obj.exception;
 
   if (error) {
@@ -296,7 +296,7 @@ events.fail = function (obj) {
   events.fireEvent('fail', obj);
 }
 
-events.skip = function (reason) {
+events.skip = function events_skip(reason) {
   // this is used to report skips associated with setupModule and nothing else
   events.currentTest.skipped = true;
   events.currentTest.skipped_reason = reason;
@@ -312,7 +312,7 @@ events.skip = function (reason) {
   events.fireEvent('skip', reason);
 }
 
-events.fireEvent = function (name, obj) {
+events.fireEvent = function events_fireEvent(name, obj) {
   if (events.appQuit) {
     // dump('* Event discarded: ' + name + ' ' + JSON.stringify(obj) + '\n');
     return;
@@ -329,7 +329,7 @@ events.fireEvent = function (name, obj) {
   }
 }
 
-events.addListener = function (name, listener) {
+events.addListener = function events_addListener(name, listener) {
   if (this.listeners[name]) {
     this.listeners[name].push(listener);
   } else if (name == '') {
@@ -339,7 +339,7 @@ events.addListener = function (name, listener) {
   }
 }
 
-events.removeListener = function (listener) {
+events.removeListener = function events_removeListener(listener) {
   for (var listenerIndex in this.listeners) {
     var e = this.listeners[listenerIndex];
 
@@ -357,7 +357,7 @@ events.removeListener = function (listener) {
   }
 }
 
-events.persist = function () {
+events.persist = function events_persist() {
   try {
     events.fireEvent('persist', persisted);
   } catch (e) {
@@ -365,12 +365,12 @@ events.persist = function () {
   }
 }
 
-events.firePythonCallback = function (obj) {
+events.firePythonCallback = function events_firePythonCallback(obj) {
   obj['test'] = events.currentModule.__file__;
   events.fireEvent('firePythonCallback', obj);
 }
 
-events.screenshot = function (obj) {
+events.screenshot = function events_screenshot(obj) {
   // Find the name of the test function
   for (var attr in events.currentModule) {
     if (events.currentModule[attr] == events.currentTest) {
@@ -384,7 +384,7 @@ events.screenshot = function (obj) {
   events.fireEvent('screenshot', obj);
 }
 
-var log = function (obj) {
+function log(obj) {
   events.fireEvent('log', obj);
 }
 
@@ -420,7 +420,7 @@ function AppQuitObserver() {
 }
 
 AppQuitObserver.prototype = {
-  observe: function (aSubject, aTopic, aData) {
+  observe: function aqo_observe(aSubject, aTopic, aData) {
     switch (aTopic) {
       case "quit-application-requested":
         Services.obs.removeObserver(this, "quit-application-requested");
@@ -456,14 +456,14 @@ function Collector() {
   this.testing = [];
 }
 
-Collector.prototype.addHttpResource = function (aDirectory, aPath) {
+Collector.prototype.addHttpResource = function collector_addHttpResource(aDirectory, aPath) {
   var fp = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
   fp.initWithPath(os.abspath(aDirectory, this.current_file));
 
   return httpd.addHttpResource(fp, aPath);
 }
 
-Collector.prototype.initTestModule = function (filename, testname) {
+Collector.prototype.initTestModule = function collector_initTestModule(filename, testname) {
   var test_module = this.loadFile(filename, this);
   var has_restarted = !(testname == null);
   test_module.__tests__ = [];
@@ -502,7 +502,7 @@ Collector.prototype.initTestModule = function (filename, testname) {
   return test_module;
 }
 
-Collector.prototype.loadFile = function (path, collector) {
+Collector.prototype.loadFile = function collector_loadFile(path, collector) {
   var moduleLoader = new securableModule.Loader({
     rootPaths: ["resource://mozmill/modules/"],
     defaultPrincipal: "system",
@@ -536,7 +536,7 @@ Collector.prototype.loadFile = function (path, collector) {
   module.mozmill = mozmill;
   module.persisted = persisted;
 
-  module.require = function (mod) {
+  module.require = function loadModule(mod) {
     var loader = new securableModule.Loader({
       rootPaths: [Services.io.newFileURI(file.parent).spec,
                   "resource://mozmill/modules/"],
@@ -591,7 +591,7 @@ Collector.prototype.loadFile = function (path, collector) {
   return module;
 }
 
-Collector.prototype.loadTestResources = function () {
+Collector.prototype.loadTestResources = function collector_loadTestResources() {
   // load resources we want in our tests
   if (mozmill === undefined) {
     mozmill = {};
@@ -627,7 +627,7 @@ function Httpd(aPort) {
   }
 }
 
-Httpd.prototype.addHttpResource = function (aDir, aPath) {
+Httpd.prototype.addHttpResource = function httpd_addHttpResource(aDir, aPath) {
   var path = aPath ? ("/" + aPath + "/") : "/";
 
   try {
@@ -639,7 +639,7 @@ Httpd.prototype.addHttpResource = function (aDir, aPath) {
   }
 };
 
-Httpd.prototype.stop = function () {
+Httpd.prototype.stop = function httpd_stop() {
   if (!this._httpd) {
     return;
   }
@@ -672,7 +672,7 @@ function Runner() {
   events.fireEvent('startRunner', true);
 }
 
-Runner.prototype.end = function () {
+Runner.prototype.end = function runner_end() {
   if (!this.ended) {
     this.ended = true;
 
@@ -685,12 +685,12 @@ Runner.prototype.end = function () {
   }
 };
 
-Runner.prototype.runTestFile = function (filename, name) {
+Runner.prototype.runTestFile = function runner_runTestFile(filename, name) {
   var module = this.collector.initTestModule(filename, name);
   this.runTestModule(module);
 };
 
-Runner.prototype.runTestModule = function (module) {
+Runner.prototype.runTestModule = function runner_RunTestModule(module) {
   appQuitObserver.runner = this;
   events.setModule(module);
 
@@ -721,7 +721,7 @@ Runner.prototype.runTestModule = function (module) {
   events.endModule(module);
 };
 
-Runner.prototype.execFunction = function (func, arg) {
+Runner.prototype.execFunction = function runner_execFunction(func, arg) {
   if (typeof func !== "function" || events.shutdownRequested) {
     return true;
   }
@@ -778,7 +778,7 @@ function runTestFile(filename, name) {
   return true;
 }
 
-Runner.prototype.skipFunction = function (func, message) {
+Runner.prototype.skipFunction = function runner_skipFunction(func, message) {
   events.setTest(func);
   events.skip(message);
   events.endTest(func);
diff --git a/mozmill/mozmill/extension/resource/modules/windows.js b/mozmill/mozmill/extension/resource/modules/windows.js
index 0f7f53d4..34a13458 100644
--- a/mozmill/mozmill/extension/resource/modules/windows.js
+++ b/mozmill/mozmill/extension/resource/modules/windows.js
@@ -29,7 +29,7 @@ var map = {
    *        Outer ID of the window to check.
    * @returns {Boolean} True if the window is part of the map, otherwise false.
    */
-  contains : function (aWindowId) {
+  contains : function map_contains(aWindowId) {
     return (aWindowId in this._windows);
   },
 
@@ -42,7 +42,7 @@ var map = {
    *        Property to retrieve the value from
    * @return {Object} Value of the window's property
    */
-  getValue : function (aWindowId, aProperty) {
+  getValue : function map_getValue(aWindowId, aProperty) {
     if (!this.contains(aWindowId)) {
       return undefined;
     } else {
@@ -59,7 +59,7 @@ var map = {
    * @param {Number} aWindowId
    *        Outer ID of the window to check.
    */
-  remove : function (aWindowId) {
+  remove : function map_remove(aWindowId) {
     if (this.contains(aWindowId)) {
       delete this._windows[aWindowId];
     }
@@ -77,7 +77,7 @@ var map = {
    * @param {Object}
    *        Value to set
    */
-  update : function (aWindowId, aProperty, aValue) {
+  update : function map_update(aWindowId, aProperty, aValue) {
     if (!this.contains(aWindowId)) {
       this._windows[aWindowId] = { };
     }
@@ -93,7 +93,7 @@ var map = {
    * @param {Window} aId - The outer id of the window to update
    * @param {Boolean} aIsLoaded - Has the window been loaded
    */
-  updatePageLoadStatus : function (aId, aIsLoaded) {
+  updatePageLoadStatus : function map_updatePageLoadStatus(aId, aIsLoaded) {
     this.update(aId, "loaded", aIsLoaded);
 
     var uuid = this.getValue(aId, "id_load_in_transition");
@@ -116,7 +116,7 @@ var map = {
    *
    * @returns {Boolean} True if the content window has been loaded
    */
-  hasPageLoaded : function (aId) {
+  hasPageLoaded : function map_hasPageLoaded(aId) {
     var load_current = this.getValue(aId, "id_load_in_transition");
     var load_handled = this.getValue(aId, "id_load_handled");
 
@@ -137,7 +137,7 @@ var map = {
 
 // Observer when a new top-level window is ready
 var windowReadyObserver = {
-  observe: function (aSubject, aTopic, aData) {
+  observe: function wro_observe(aSubject, aTopic, aData) {
     // Not in all cases we get a ChromeWindow. So ensure we really operate
     // on such an instance. Otherwise load events will not be handled.
     var win = utils.getChromeWindow(aSubject);
@@ -151,7 +151,7 @@ var windowReadyObserver = {
 
 // Observer when a top-level window is closed
 var windowCloseObserver = {
-  observe: function (aSubject, aTopic, aData) {
+  observe: function wco_observe(aSubject, aTopic, aData) {
     var id = utils.getWindowId(aSubject);
     // dump("*** 'outer-window-destroyed' observer notification: id=" + id + "\n");
 
diff --git a/mozmill/mozmill/extension/resource/stdlib/dom.js b/mozmill/mozmill/extension/resource/stdlib/dom.js
index 06bfcb52..f0f247f5 100644
--- a/mozmill/mozmill/extension/resource/stdlib/dom.js
+++ b/mozmill/mozmill/extension/resource/stdlib/dom.js
@@ -5,7 +5,7 @@
 var EXPORTED_SYMBOLS = ['getAttributes'];
 
 
-var getAttributes = function (node) {
+function getAttributes(node) {
   var attributes = {};
 
   for (var i in node.attributes) {
diff --git a/mozmill/mozmill/extension/resource/stdlib/objects.js b/mozmill/mozmill/extension/resource/stdlib/objects.js
index 57611714..7d3a000d 100644
--- a/mozmill/mozmill/extension/resource/stdlib/objects.js
+++ b/mozmill/mozmill/extension/resource/stdlib/objects.js
@@ -4,7 +4,7 @@
 
 var EXPORTED_SYMBOLS = ['getLength', ];//'compare'];
 
-var getLength = function (obj) {
+function getLength(obj) {
   var len = 0;
   for (i in obj) {
     len++;
diff --git a/mozmill/mozmill/extension/resource/stdlib/strings.js b/mozmill/mozmill/extension/resource/stdlib/strings.js
index 24a93d95..35d599e9 100644
--- a/mozmill/mozmill/extension/resource/stdlib/strings.js
+++ b/mozmill/mozmill/extension/resource/stdlib/strings.js
@@ -6,11 +6,11 @@ var EXPORTED_SYMBOLS = ['trim', 'vslice'];
 
 var arrays = {}; Components.utils.import('resource://mozmill/stdlib/arrays.js', arrays);
 
-var trim = function (str) {
+function trim(str) {
   return (str.replace(/^[\s\xA0]+/, "").replace(/[\s\xA0]+$/, ""));
 }
 
-var vslice = function (str, svalue, evalue) {
+function vslice(str, svalue, evalue) {
   var sindex = arrays.indexOf(str, svalue);
   var eindex = arrays.rindexOf(str, evalue);
   return str.slice(sindex + 1, eindex);
diff --git a/mozmill/mozmill/extension/resource/stdlib/utils.js b/mozmill/mozmill/extension/resource/stdlib/utils.js
index 42e1f2fb..dfe34529 100644
--- a/mozmill/mozmill/extension/resource/stdlib/utils.js
+++ b/mozmill/mozmill/extension/resource/stdlib/utils.js
@@ -132,7 +132,7 @@ function getWindowId(aWindow) {
   }
 }
 
-var checkChrome = function () {
+function checkChrome() {
   var loc = window.document.location.href;
   try {
     loc = window.top.document.location.href;
diff --git a/mutt/mutt/tests/js/testAssertions/testExpectAssert.js b/mutt/mutt/tests/js/testAssertions/testExpectAssert.js
index f94563f3..a5c2c370 100644
--- a/mutt/mutt/tests/js/testAssertions/testExpectAssert.js
+++ b/mutt/mutt/tests/js/testAssertions/testExpectAssert.js
@@ -73,7 +73,7 @@ function Err() {
 /**
  * Expect class for assertions which doesn't add failing and passing frames
  */
-var SoftExpect = function() {}
+function SoftExpect() {}
 SoftExpect.prototype = new assertions.Expect();
 SoftExpect.prototype.constructor = SoftExpect;
 
diff --git a/mutt/mutt/tests/js/testFrame/testHttpd/testMultipleLoads.js b/mutt/mutt/tests/js/testFrame/testHttpd/testMultipleLoads.js
index fdc85aad..a77e01c9 100644
--- a/mutt/mutt/tests/js/testFrame/testHttpd/testMultipleLoads.js
+++ b/mutt/mutt/tests/js/testFrame/testHttpd/testMultipleLoads.js
@@ -48,7 +48,7 @@ function loadPage(aUrl, aResponseType) {
   var request = { succeeded: false };
 
   observer = {
-    observe: function (aSubject, aTopic, aData) {
+    observe: function loadPage_observe(aSubject, aTopic, aData) {
       var channel = aSubject.QueryInterface(Ci.nsIHttpChannel);
 
       switch (aTopic) {
diff --git a/mutt/mutt/tests/js/testFrame/testUserShutdown/testTimeoutRestartApplication/test1.js b/mutt/mutt/tests/js/testFrame/testUserShutdown/testTimeoutRestartApplication/test1.js
index c85b4e8b..6abb9108 100644
--- a/mutt/mutt/tests/js/testFrame/testUserShutdown/testTimeoutRestartApplication/test1.js
+++ b/mutt/mutt/tests/js/testFrame/testUserShutdown/testTimeoutRestartApplication/test1.js
@@ -5,7 +5,7 @@
 Cu.import("resource://gre/modules/Services.jsm");
 
 var observer = {
-  observe: function (aSubject, aTopic, aData) {
+  observe: function observer_observe(aSubject, aTopic, aData) {
     Services.obs.removeObserver(observer, "quit-application-requested", false);
     persisted.restarted = true;
   }
diff --git a/mutt/mutt/tests/js/testUtils/testSaveScreenshot.js b/mutt/mutt/tests/js/testUtils/testSaveScreenshot.js
index 4a8baf64..b1c7d7ca 100644
--- a/mutt/mutt/tests/js/testUtils/testSaveScreenshot.js
+++ b/mutt/mutt/tests/js/testUtils/testSaveScreenshot.js
@@ -47,7 +47,7 @@ function testScreenshotSaveCorruption() {
  * @see http://forums.mozillazine.org/viewtopic.php?p=5091285#p5091285
  */
 var brodyFile2DataURL = {
-  getDataURLFromIStream: function (aInputStream, aContentType) {
+  getDataURLFromIStream: function bfdu_getDataURLFromIStream(aInputStream, aContentType) {
     var contentType = aContentType || "application/octet-stream";
 
     var binaryStream = Cc["@mozilla.org/binaryinputstream;1"]
@@ -57,7 +57,7 @@ var brodyFile2DataURL = {
     return "data:" + contentType + ";base64," + encoding;
   },
 
-  getDataURLFromFile: function (aFile) {
+  getDataURLFromFile: function bfdu_getDataURLFromFile(aFile) {
     var contentType = Cc["@mozilla.org/mime;1"]
                       .getService(Ci.nsIMIMEService).getTypeFromFile(aFile);
     var inputStream = Cc["@mozilla.org/network/file-input-stream;1"]
diff --git a/mutt/mutt/tests/python/js-modules/testFailureBackgroundThread.js b/mutt/mutt/tests/python/js-modules/testFailureBackgroundThread.js
index 53a975c7..55003f4f 100644
--- a/mutt/mutt/tests/python/js-modules/testFailureBackgroundThread.js
+++ b/mutt/mutt/tests/python/js-modules/testFailureBackgroundThread.js
@@ -12,7 +12,7 @@ function testExceptionBackgroundThread() {
   var timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
 
   var event = {
-    notify: function () {
+    notify: function event_notify() {
       try {
         // Throws an error because interval is not defined
         timer.initWithCallback(this, interval, Ci.nsITimer.TYPE_ONE_SHOT);