diff --git a/toolkit/mozapps/extensions/src/nsExtensionManager.js.in b/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
index 1e8098b85392..fd2a114b23dd 100644
--- a/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+++ b/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
@@ -209,7 +209,7 @@ var BundleManager = {
   *          The URI of the bundle to load
   * @returns A nsIStringBundle which was retrieved.
   */
-  getBundle: function(bundleURI) {
+  getBundle: function BundleManager_getBundle(bundleURI) {
     var sbs = Cc["@mozilla.org/intl/stringbundle;1"].
               getService(Ci.nsIStringBundleService);
     return sbs.createBundle(bundleURI);
@@ -994,11 +994,11 @@ function ArrayEnumerator(aItems) {
 ArrayEnumerator.prototype = {
   _index: 0,
 
-  hasMoreElements: function () {
+  hasMoreElements: function ArrayEnumerator_hasMoreElements() {
     return this._index < this._contents.length;
   },
 
-  getNext: function () {
+  getNext: function ArrayEnumerator_getNext() {
     return this._contents[this._index++];
   }
 };
@@ -1036,7 +1036,7 @@ FileEnumerator.prototype = {
   /**
    * Stop enumerating. Nothing to do here.
    */
-  close: function() {
+  close: function FileEnumerator_close() {
   }
 };
 
@@ -1100,7 +1100,7 @@ DirectoryInstallLocation.prototype = {
    *          The file containing the directory path
    * @returns A nsILocalFile object representing the linked directory.
    */
-  _readDirectoryFromFile: function(file) {
+  _readDirectoryFromFile: function DirInstallLocation__readDirectoryFromFile(file) {
     var fis = Cc["@mozilla.org/network/file-input-stream;1"].
               createInstance(Ci.nsIFileInputStream);
     fis.init(file, -1, -1, false);
@@ -1165,7 +1165,7 @@ DirectoryInstallLocation.prototype = {
    * N.B. This function makes no promises about whether or not this path is
    *      actually maintained by this Install Location.
    */
-  getIDForLocation: function(file) {
+  getIDForLocation: function DirInstallLocation_getIDForLocation(file) {
     var section = file.leafName;
     var filePD = file.persistentDescriptor;
     if (filePD in this._locationToIDMap)
@@ -1220,7 +1220,7 @@ DirectoryInstallLocation.prototype = {
   /**
    * See nsIExtensionManager.idl
    */
-  getItemLocation: function(id) {
+  getItemLocation: function DirInstallLocation_getItemLocation(id) {
     var itemLocation = this.location;
     itemLocation.append(id);
     if (itemLocation.exists() && !itemLocation.isDirectory())
@@ -1233,7 +1233,7 @@ DirectoryInstallLocation.prototype = {
   /**
    * See nsIExtensionManager.idl
    */
-  itemIsManagedIndependently: function(id) {
+  itemIsManagedIndependently: function DirInstallLocation_itemIsManagedIndependently(id) {
     if (this._independent)
       return true;
     var itemLocation = this.location;
@@ -1244,7 +1244,7 @@ DirectoryInstallLocation.prototype = {
   /**
    * See nsIExtensionManager.idl
    */
-  getItemFile: function(id, filePath) {
+  getItemFile: function DirInstallLocation_getItemFile(id, filePath) {
     var itemLocation = this.getItemLocation(id).clone();
     var parts = filePath.split("/");
     for (var i = 0; i < parts.length; ++i)
@@ -1259,7 +1259,7 @@ DirectoryInstallLocation.prototype = {
    * @param   id
    *          The GUID of the item the file represents
    */
-  stageFile: function(file, id) {
+  stageFile: function DirInstallLocation_stageFile(file, id) {
     var stagedFile = this.location;
     stagedFile.append(DIR_STAGE);
     stagedFile.append(id);
@@ -1288,7 +1288,7 @@ DirectoryInstallLocation.prototype = {
    *          The ID of the staged package
    * @returns an nsIFile if the package exists otherwise null.
    */
-  getStageFile: function(id) {
+  getStageFile: function DirInstallLocation_getStageFile(id) {
     var stageFile = null;
     var stageDir = this.location;
     stageDir.append(DIR_STAGE);
@@ -1325,7 +1325,7 @@ DirectoryInstallLocation.prototype = {
    * @param   file
    *          The file to remove.
    */
-  removeFile: function(file) {
+  removeFile: function DirInstallLocation_removeFile(file) {
     if (file.exists())
       file.remove(false);
     var parent = file.parent;
@@ -1428,7 +1428,7 @@ WinRegInstallLocation.prototype = {
    * @param   key
    *          The key that contains the GUID->path pairs
    */
-  _readAddons: function(key) {
+  _readAddons: function RegInstallLocation__readAddons(key) {
     var count = key.valueCount;
     for (var i = 0; i < count; ++i) {
       var id = key.getValueName(i);
@@ -1473,15 +1473,15 @@ WinRegInstallLocation.prototype = {
     return this._priority;
   },
 
-  getItemLocation: function(id) {
+  getItemLocation: function RegInstallLocation_getItemLocation(id) {
     return this._IDToDirMap[id];
   },
 
-  getIDForLocation: function(dir) {
+  getIDForLocation: function RegInstallLocation_getIDForLocation(dir) {
     return this._DirToIDMap[dir.path];
   },
 
-  getItemFile: function(id, filePath) {
+  getItemFile: function RegInstallLocation_getItemFile(id, filePath) {
     var itemLocation = this.getItemLocation(id).clone();
     var parts = filePath.split("/");
     for (var i = 0; i < parts.length; ++i)
@@ -1489,7 +1489,7 @@ WinRegInstallLocation.prototype = {
     return itemLocation;
   },
 
-  itemIsManagedIndependently: function(id) {
+  itemIsManagedIndependently: function RegInstallLocation_itemIsManagedIndependently(id) {
     return true;
   },
 
@@ -1541,7 +1541,7 @@ Installer.prototype = {
    *          the item is assumed to be an expanded directory, located at the GUID
    *          key in the supplied Install Location.
    */
-  installFromFile: function(file) {
+  installFromFile: function Installer_installFromFile(file) {
     // Move files from the staging dir into the extension's final home.
     if (file && file.exists()) {
       this._installExtensionFiles(file);
@@ -1565,7 +1565,7 @@ Installer.prototype = {
    * @param   file
    *          The XPI/JAR file to install from.
    */
-  _installExtensionFiles: function(file) {
+  _installExtensionFiles: function Installer__installExtensionFiles(file) {
     /**
       * Callback for |safeInstallOperation| that performs file level installation
       * steps for an Extension.
@@ -1727,7 +1727,7 @@ Installer.prototype = {
    * Upgrade contents.rdf Chrome Manifests used by this Theme to the new
    * chrome.manifest format if necessary.
    */
-  upgradeThemeChrome: function() {
+  upgradeThemeChrome: function Installer_upgradeThemeChrome() {
     // Use the Chrome Registry API to install the theme there
     var cr = Cc["@mozilla.org/chrome/chrome-registry;1"].
              getService(Ci.nsIToolkitChromeRegistry);
@@ -1780,7 +1780,7 @@ Installer.prototype = {
    * Upgrade contents.rdf Chrome Manifests used by this Extension to the new
    * chrome.manifest format if necessary.
    */
-  upgradeExtensionChrome: function() {
+  upgradeExtensionChrome: function Installer_upgradeExtensionChrome() {
     // If the extension is aware of the new flat chrome manifests and has
     // included one, just use it instead of generating one from the
     // install.rdf/contents.rdf data.
@@ -2094,7 +2094,7 @@ var PendingOperations = {
    *                          is installed.
    *          "id"            The GUID of the item.
    */
-  addItem: function(opType, entry) {
+  addItem: function PendingOperations_addItem(opType, entry) {
     if (opType == OP_NONE)
       this.clearOpsForItem(entry.id);
     else {
@@ -2111,7 +2111,7 @@ var PendingOperations = {
    * @param   id
    *          The GUID of the item to remove the entry for
    */
-  clearItem: function(opType, id) {
+  clearItem: function PendingOperations_clearItem(opType, id) {
     if (opType in this._ops && id in this._ops[opType])
       delete this._ops[opType][id];
   },
@@ -2121,7 +2121,7 @@ var PendingOperations = {
    * @param   id
    *          The ID of the item to remove the entries for
    */
-  clearOpsForItem: function(id) {
+  clearOpsForItem: function PendingOperations_clearOpsForItem(id) {
     for (var opType in this._ops) {
       if (id in this._ops[opType])
         delete this._ops[opType][id];
@@ -2133,7 +2133,7 @@ var PendingOperations = {
    * @param   opType
    *          The type of Operation to remove all entries for
    */
-  clearItems: function(opType) {
+  clearItems: function PendingOperations_clearItems(opType) {
     if (opType in this._ops)
       delete this._ops[opType];
   },
@@ -2143,7 +2143,7 @@ var PendingOperations = {
    * @param   opType
    *          The type of Operation to return a list of
    */
-  getOperations: function(opType) {
+  getOperations: function PendingOperations_getOperations(opType) {
     if (!(opType in this._ops))
       return [];
     var ops = [];
@@ -2186,7 +2186,7 @@ var InstallLocations = {
    * @param   name
    *          The name of the Install Location to get
    */
-  get: function(name) {
+  get: function InstallLocations_get(name) {
     return name in this._locations ? this._locations[name] : null;
   },
 
@@ -2195,7 +2195,7 @@ var InstallLocations = {
    * @param   installLocation
    *          The Install Location to register
    */
-  put: function(installLocation) {
+  put: function InstallLocations_put(installLocation) {
     this._locations[installLocation.name] = installLocation;
   }
 };
@@ -2229,7 +2229,7 @@ var StartupCache = {
    *          Whether or not we should create a new entry for this item
    *          in the cache if one does not already exist.
    */
-  put: function(installLocation, id, op, shouldCreate) {
+  put: function StartupCache_put(installLocation, id, op, shouldCreate) {
     var itemLocation = installLocation.getItemLocation(id);
 
     var descriptor = null;
@@ -2264,7 +2264,7 @@ var StartupCache = {
    * @param shouldCreate
    *        Boolean value indicating whether to create or delete the entry.
    */
-  _putRaw: function(key, id, descriptor, mtime, op, shouldCreate) {
+  _putRaw: function StartupCache__putRaw(key, id, descriptor, mtime, op, shouldCreate) {
     if (!(key in this.entries))
       this.entries[key] = { };
     if (!(id in this.entries[key]))
@@ -2293,7 +2293,7 @@ var StartupCache = {
    * @param   id
    *          The GUID of the item.
    */
-  clearEntry: function(installLocation, id) {
+  clearEntry: function StartupCache_clearEntry(installLocation, id) {
     var key = installLocation.name;
     if (key in this.entries && id in this.entries[key])
       this.entries[key][id] = null;
@@ -2305,7 +2305,7 @@ var StartupCache = {
    *          The GUID of the item to locate.
    * @returns An array of Startup Cache entries for the specified ID.
    */
-  findEntries: function(id) {
+  findEntries: function StartupCache_findEntries(id) {
     var entries = [];
     for (var key in this.entries) {
       if (id in this.entries[key])
@@ -2319,7 +2319,7 @@ var StartupCache = {
    * The Item-Change manifest currently holds a list of paths, with the last
    * mtime for each path, and the GUID of the item at that path.
    */
-  read: function() {
+  read: function StartupCache_read() {
     var itemChangeManifest = getFile(KEY_PROFILEDIR, [FILE_EXTENSIONS_STARTUP_CACHE]);
     if (!itemChangeManifest.exists()) {
       // There is no change manifest for some reason, either we're in an initial
@@ -2365,7 +2365,7 @@ var StartupCache = {
   /**
    * Writes the Startup Cache to disk
    */
-  write: function() {
+  write: function StartupCache_write() {
     var extensionsCacheFile = getFile(KEY_PROFILEDIR, [FILE_EXTENSIONS_STARTUP_CACHE]);
     var fos = openSafeFileOutputStream(extensionsCacheFile);
     for (var locationKey in this.entries) {
@@ -2517,7 +2517,7 @@ ExtensionManager.prototype = {
   /**
    * See nsIObserver.idl
    */
-  observe: function(subject, topic, data) {
+  observe: function EM_observe(subject, topic, data) {
     switch (topic) {
     case "app-startup":
       gOS.addObserver(this, "profile-after-change", false);
@@ -2555,14 +2555,14 @@ ExtensionManager.prototype = {
    * Refresh the logging enabled global from preferences when the user changes
    * the preference settting.
    */
-  _loggingToggled: function() {
+  _loggingToggled: function EM__loggingToggled() {
     gLoggingEnabled = getPref("getBoolPref", PREF_EM_LOGGING_ENABLED, false);
   },
 
   /**
    * Retrieves the current locale
    */
-  _updateLocale: function() {
+  _updateLocale: function EM__updateLocale() {
     try {
       if (gPref.getBoolPref(PREF_MATCH_OS_LOCALE)) {
         var localeSvc = Cc["@mozilla.org/intl/nslocaleservice;1"].
@@ -2580,7 +2580,7 @@ ExtensionManager.prototype = {
    * When a preference is toggled that affects whether an item is usable or not
    * we must app-enable or app-disable the item based on the new settings.
    */
-  _updateAppDisabledState: function() {
+  _updateAppDisabledState: function EM__updateAppDisabledState() {
     gCheckCompatibility = getPref("getBoolPref", PREF_EM_CHECK_COMPATIBILITY, true);
     gCheckUpdateSecurity = getPref("getBoolPref", PREF_EM_CHECK_UPDATE_SECURITY, true);
     var ds = this.datasource;
@@ -2605,7 +2605,7 @@ ExtensionManager.prototype = {
   /**
    * Initialize the system after a profile has been selected.
    */
-  _profileSelected: function() {
+  _profileSelected: function EM__profileSelected() {
     // Tell the Chrome Registry which Skin to select
     try {
       if (gPref.getBoolPref(PREF_DSS_SWITCHPENDING)) {
@@ -2643,7 +2643,7 @@ ExtensionManager.prototype = {
   /**
    * Notify user that there are new addons updates
    */
-  _showUpdatesWindow: function() {
+  _showUpdatesWindow: function EM__showUpdatesWindow() {
     if (!getPref("getBoolPref", PREF_UPDATE_NOTIFYUSER, false))
       return;
 
@@ -2664,7 +2664,7 @@ ExtensionManager.prototype = {
   /**
    * Clean up on application shutdown to avoid leaks.
    */
-  _shutdown: function() {
+  _shutdown: function EM__shutdown() {
     if (!gAllowFlush) {
       // Something went wrong and there are potentially flushes pending.
       ERROR("Reached _shutdown and without clearing any pending flushes");
@@ -2712,7 +2712,7 @@ ExtensionManager.prototype = {
    * @returns true if any critical file is missing and the system needs to
    *          be rebuilt, false otherwise.
    */
-  _ensureDatasetIntegrity: function () {
+  _ensureDatasetIntegrity: function EM__ensureDatasetIntegrity() {
     var extensionsDS = getFile(KEY_PROFILEDIR, [FILE_EXTENSIONS]);
     var extensionsINI = getFile(KEY_PROFILEDIR, [FILE_EXTENSION_MANIFEST]);
     var extensionsCache = getFile(KEY_PROFILEDIR, [FILE_EXTENSIONS_STARTUP_CACHE]);
@@ -2738,7 +2738,7 @@ ExtensionManager.prototype = {
   /**
    * See nsIExtensionManager.idl
    */
-  start: function(commandLine) {
+  start: function EM_start(commandLine) {
     var isDirty = false;
     var forceAutoReg = false;
 
@@ -2807,7 +2807,7 @@ ExtensionManager.prototype = {
   /**
    * Begins all background update check timers
    */
-  _startTimers: function() {
+  _startTimers: function EM__startTimers() {
     // Register a background update check timer
     var tm = Cc["@mozilla.org/updates/timer-manager;1"].
              getService(Ci.nsIUpdateTimerManager);
@@ -2820,7 +2820,7 @@ ExtensionManager.prototype = {
    * @param   timer
    *          The timer that fired
    */
-  notify: function(timer) {
+  notify: function EM_notify(timer) {
     if (!getPref("getBoolPref", PREF_EM_UPDATE_ENABLED, true))
       return;
 
@@ -2835,7 +2835,7 @@ ExtensionManager.prototype = {
   /**
    * See nsIExtensionManager.idl
    */
-  handleCommandLineArgs: function(commandLine) {
+  handleCommandLineArgs: function EM_handleCommandLineArgs(commandLine) {
     try {
       var globalExtension = commandLine.handleFlagWithParam("install-global-extension", false);
       if (globalExtension) {
@@ -2860,7 +2860,7 @@ ExtensionManager.prototype = {
    * @param   file
    *          The XPI/JAR file to extract
    */
-  _installGlobalItem: function(file) {
+  _installGlobalItem: function EM__installGlobalItem(file) {
     if (!file || !file.exists())
       throw new Error("Unable to find the file specified on the command line!");
 #ifdef XP_WIN
@@ -2896,7 +2896,7 @@ ExtensionManager.prototype = {
    * @returns A nsIUpdateItem representing the dropped XPI if this file was a
    *          XPI/JAR that needs installation, null otherwise.
    */
-  _getItemForDroppedFile: function(file, location) {
+  _getItemForDroppedFile: function EM__getItemForDroppedFile(file, location) {
     if (fileIsItemPackage(file)) {
       // We know nothing about this item, it is not something we've
       // staged in preparation for finalization, so assume it's something
@@ -2951,7 +2951,7 @@ ExtensionManager.prototype = {
    *          The callback that configures the item for installation upon
    *          successful validation.
    */
-   installItem: function(id, location, callback) {
+   installItem: function EM_installItem(id, location, callback) {
     // As this is the only pint at which we reliably know the installation
     var installRDF = location.getItemFile(id, FILE_INSTALL_MANIFEST);
     if (installRDF.exists()) {
@@ -3010,7 +3010,7 @@ ExtensionManager.prototype = {
    * Manager, e.g. items were added or removed from a Install Location or items
    * in an Install Location changed.
    */
-  _checkForFileChanges: function() {
+  _checkForFileChanges: function EM__checkForFileChanges() {
     var em = this;
 
     /**
@@ -3306,7 +3306,7 @@ ExtensionManager.prototype = {
    * @returns true if actions were performed that require a restart, false
    *          otherwise.
    */
-  _upgradeChrome: function() {
+  _upgradeChrome: function EM__upgradeChrome() {
     if (inSafeMode())
       return false;
 
@@ -3401,7 +3401,7 @@ ExtensionManager.prototype = {
     return checkForNewChrome;
   },
 
-  _checkForUncoveredItem: function(id) {
+  _checkForUncoveredItem: function EM__checkForUncoveredItem(id) {
     var ds = this.datasource;
     var oldLocation = this.getInstallLocation(id);
     var newLocations = [];
@@ -3445,7 +3445,7 @@ ExtensionManager.prototype = {
    * @returns true if actions were performed that require a restart, false
    *          otherwise.
    */
-  _finishOperations: function() {
+  _finishOperations: function EM__finishOperations() {
     try {
       // Stuff has changed, load the Extensions datasource in all its RDFey
       // glory.
@@ -3598,7 +3598,7 @@ ExtensionManager.prototype = {
    *          the application must now be restarted to reinitialize XPCOM,
    *          false otherwise.
    */
-  checkForMismatches: function() {
+  checkForMismatches: function EM_checkForMismatches() {
     // Check to see if the version of the application that is being started
     // now is the same one that was started last time.
     var currAppVersion = gApp.version;
@@ -3776,7 +3776,7 @@ ExtensionManager.prototype = {
   /**
    * Shows the "Compatibility Updates" UI
    */
-  _showMismatchWindow: function(items) {
+  _showMismatchWindow: function EM__showMismatchWindow(items) {
     var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
              getService(Ci.nsIWindowMediator);
     var wizard = wm.getMostRecentWindow("Update:Wizard");
@@ -3800,7 +3800,7 @@ ExtensionManager.prototype = {
    * 4) migrates the disabled attribute from the old datasource.
    * 5) migrates the app compatibility info from the old datasource.
    */
-  _upgradeFromV10: function() {
+  _upgradeFromV10: function EM__upgradeFromV10() {
     var extensionsDS = getFile(KEY_PROFILEDIR, [FILE_EXTENSIONS]);
     var dsExists = extensionsDS.exists();
     // Toolkiit 1.7 profiles (Firefox 1.0, Thunderbird 1.0, etc.) have a default
@@ -3981,7 +3981,7 @@ ExtensionManager.prototype = {
    * @param   needsRestart
    *          true if the application needs to restart again, false otherwise.
    */
-  _updateManifests: function(needsRestart) {
+  _updateManifests: function EM__updateManifests(needsRestart) {
     // During startup we block flushing until the startup operations are all
     // complete to reduce file accesses that can trigger bug 431065
     if (gAllowFlush) {
@@ -4005,7 +4005,7 @@ ExtensionManager.prototype = {
    *          The nsIUpdateItem type to return a list of items of
    * @returns An array of active items of the specified type.
    */
-  _getActiveItems: function(type) {
+  _getActiveItems: function EM__getActiveItems(type) {
     var allItems = this.getItemList(type, { });
     var activeItems = [];
     var ds = this.datasource;
@@ -4038,7 +4038,7 @@ ExtensionManager.prototype = {
   /**
    * Write the Extensions List
    */
-  _updateExtensionsManifest: function() {
+  _updateExtensionsManifest: function EM__updateExtensionsManifest() {
     // When an operation is performed that requires a component re-registration
     // (extension enabled/disabled, installed, uninstalled), we must write the
     // set of paths where extensions live so that the startup system can determine
@@ -4139,7 +4139,7 @@ ExtensionManager.prototype = {
    *                     INSTALLERROR_BLOCKLISTED
    *                       error, item is blocklisted
    */
-  _getInstallData: function(installManifest) {
+  _getInstallData: function EM__getInstallData(installManifest) {
     var installData = { id          : "",
                         version     : "",
                         name        : "",
@@ -4272,7 +4272,7 @@ ExtensionManager.prototype = {
    *          The name of the Install Location where this item should be
    *          installed.
    */
-  installItemFromFile: function(xpiFile, installLocationKey) {
+  installItemFromFile: function EM_installItemFromFile(xpiFile, installLocationKey) {
     this.installItemFromFileInternal(xpiFile, installLocationKey, null);
 
     // If there are no compatibility checks running and no downloads in
@@ -4295,7 +4295,9 @@ ExtensionManager.prototype = {
    *          Can be null when invoked from callers other than the Version
    *          Update check.
    */
-  installItemFromFileInternal: function(aXPIFile, aInstallLocationKey, aInstallManifest) {
+  installItemFromFileInternal: function EM_installItemFromFileInternal(aXPIFile,
+                                                                       aInstallLocationKey,
+                                                                       aInstallManifest) {
     var em = this;
     /**
      * Gets the Install Location for an Item.
@@ -4479,7 +4481,7 @@ ExtensionManager.prototype = {
        * @param   installRDF
        *          The install.rdf file that was extracted from the xpi.
        */
-      checkForUpdates: function(item, installManifest, xpiFile) {
+      checkForUpdates: function EM_checkForUpdates(item, installManifest, xpiFile) {
         this._xpi             = xpiFile;
         this._installManifest = installManifest;
 
@@ -4492,21 +4494,21 @@ ExtensionManager.prototype = {
       /**
        * See nsIExtensionManager.idl
        */
-      onUpdateStarted: function() {
+      onUpdateStarted: function EM_onUpdateStarted() {
         LOG("Phone Home Listener: Update Started");
       },
 
       /**
        * See nsIExtensionManager.idl
        */
-      onUpdateEnded: function() {
+      onUpdateEnded: function EM_onUpdateEnded() {
         LOG("Phone Home Listener: Update Ended");
       },
 
       /**
        * See nsIExtensionManager.idl
        */
-      onAddonUpdateStarted: function(addon) {
+      onAddonUpdateStarted: function EM_onAddonUpdateStarted(addon) {
         if (!addon)
           throw Cr.NS_ERROR_INVALID_ARG;
 
@@ -4518,7 +4520,7 @@ ExtensionManager.prototype = {
       /**
        * See nsIExtensionManager.idl
        */
-      onAddonUpdateEnded: function(addon, status) {
+      onAddonUpdateEnded: function EM_onAddonUpdateEnded(addon, status) {
         if (!addon)
           throw Cr.NS_ERROR_INVALID_ARG;
 
@@ -4789,7 +4791,7 @@ ExtensionManager.prototype = {
    * @returns true if installation of an item of this type requires a
    *          restart.
    */
-  installRequiresRestart: function(id, type) {
+  installRequiresRestart: function EM_installRequiresRestart(id, type) {
     switch (type) {
     case Ci.nsIUpdateItem.TYPE_THEME:
       var internalName = this.datasource.getItemProperty(id, "internalName");
@@ -4818,7 +4820,10 @@ ExtensionManager.prototype = {
    * @param   type
    *          The nsIUpdateItem type of this item.
    */
-  _configureForthcomingItem: function(installManifest, id, installLocation, type) {
+  _configureForthcomingItem: function EM__configureForthcomingItem(installManifest,
+                                                                   id,
+                                                                   installLocation,
+                                                                   type) {
     var ds = this.datasource;
     ds.updateVisibleList(id, installLocation.name, false);
 
@@ -4866,7 +4871,7 @@ ExtensionManager.prototype = {
    * @param   type
    *          The nsIUpdateItem type of this item.
    */
-  _upgradeItem: function (installManifest, id, installLocation, type) {
+  _upgradeItem: function EM__upgradeItem(installManifest, id, installLocation, type) {
     // Don't change any props that would need to be reset if the install fails.
     // They will be reset as appropriate by the upgrade/install process.
     var ds = this.datasource;
@@ -4893,7 +4898,7 @@ ExtensionManager.prototype = {
    *          The XPI/JAR file to install from. If this is null, we try to
    *          determine the stage file location from the ID.
    */
-  _finalizeInstall: function(id, file) {
+  _finalizeInstall: function EM__finalizeInstall(id, file) {
     var ds = this.datasource;
     var type = ds.getItemProperty(id, "type");
     if (id == 0 || id == -1) {
@@ -4941,7 +4946,7 @@ ExtensionManager.prototype = {
    * @param   installLocation
    *          The nsIInstallLocation of the item
    */
-  _finalizeUpgrade: function(id, installLocation) {
+  _finalizeUpgrade: function EM__finalizeUpgrade(id, installLocation) {
     // Retrieve the item properties *BEFORE* we clean the resource!
     var ds = this.datasource;
 
@@ -4982,7 +4987,7 @@ ExtensionManager.prototype = {
    * @param   id
    *          The GUID of the item to uninstall.
    */
-  _finalizeUninstall: function(id) {
+  _finalizeUninstall: function EM__finalizeUninstall(id) {
     var ds = this.datasource;
 
     var installLocation = this.getInstallLocation(id);
@@ -5039,7 +5044,7 @@ ExtensionManager.prototype = {
    * @param   id
    *          The GUID of the item to uninstall.
    */
-  uninstallItem: function(id) {
+  uninstallItem: function EM_uninstallItem(id) {
     var ds = this.datasource;
     ds.updateDownloadState(PREFIX_ITEM_URI + id, null);
     if (!ds.isDownloadItem(id)) {
@@ -5082,7 +5087,7 @@ ExtensionManager.prototype = {
   },
 
   /* See nsIExtensionManager.idl */
-  cancelInstallItem: function(id) {
+  cancelInstallItem: function EM_cancelInstallItem(id) {
     var ds = this.datasource;
     var opType = ds.getItemProperty(id, "opType");
     if (opType != OP_NEEDS_UPGRADE && opType != OP_NEEDS_INSTALL)
@@ -5133,7 +5138,7 @@ ExtensionManager.prototype = {
    * @param   id
    *          The ID of the item.
    */
-  cancelUninstallItem: function(id) {
+  cancelUninstallItem: function EM_cancelUninstallItem(id) {
     var ds = this.datasource;
     var appDisabled = ds.getItemProperty(id, "appDisabled");
     var userDisabled = ds.getItemProperty(id, "userDisabled");
@@ -5162,7 +5167,7 @@ ExtensionManager.prototype = {
    * @param   op
    *          The name of the operation to be performed
    */
-  _setOp: function(id, op) {
+  _setOp: function EM__setOp(id, op) {
     var location = this.getInstallLocation(id);
     StartupCache.put(location, id, op, true);
     PendingOperations.addItem(op, { locationKey: location.name, id: id });
@@ -5200,7 +5205,7 @@ ExtensionManager.prototype = {
    * @param   id
    *          The ID of the item to be enabled by the application.
    */
-  _appEnableItem: function(id) {
+  _appEnableItem: function EM__appEnableItem(id) {
     var ds = this.datasource;
     var appDisabled = ds.getItemProperty(id, "appDisabled");
     if (appDisabled == OP_NONE || appDisabled == OP_NEEDS_ENABLE)
@@ -5266,7 +5271,7 @@ ExtensionManager.prototype = {
    * @param   id
    *          The ID of the item to be disabled by the application.
    */
-  _appDisableItem: function(id) {
+  _appDisableItem: function EM__appDisableItem(id) {
     var ds = this.datasource;
     var appDisabled = ds.getItemProperty(id, "appDisabled");
     if (appDisabled == "true" || appDisabled == OP_NEEDS_DISABLE)
@@ -5328,7 +5333,7 @@ ExtensionManager.prototype = {
    * @param   id
    *          The ID of the item to be enabled by the user.
    */
-  enableItem: function(id) {
+  enableItem: function EM_enableItem(id) {
     var ds = this.datasource;
     var opType = ds.getItemProperty(id, "opType");
     var appDisabled = ds.getItemProperty(id, "appDisabled");
@@ -5372,7 +5377,7 @@ ExtensionManager.prototype = {
    * @param   id
    *          The ID of the item to be disabled by the user.
    */
-  disableItem: function(id) {
+  disableItem: function EM_disableItem(id) {
     var ds = this.datasource;
     var opType = ds.getItemProperty(id, "opType");
     var appDisabled = ds.getItemProperty(id, "appDisabled");
@@ -5414,7 +5419,7 @@ ExtensionManager.prototype = {
    * @param   id
    *          The ID of the item to check
    */
-  _isUsableItem: function(id) {
+  _isUsableItem: function EM__isUsableItem(id) {
     var ds = this.datasource;
     /* If we're not compatibility checking or if the item is compatible
      * and if it isn't blocklisted and has all dependencies satisfied then
@@ -5441,7 +5446,7 @@ ExtensionManager.prototype = {
    * @param   id
    *          The ID of the item whose dependent items will be checked
    */
-  _updateDependentItemsForID: function(id) {
+  _updateDependentItemsForID: function EM__updateDependentItemsForID(id) {
     var ds = this.datasource;
     var dependentItems = this.getDependentItemListForID(id, true, { });
     for (var i = 0; i < dependentItems.length; ++i) {
@@ -5458,7 +5463,7 @@ ExtensionManager.prototype = {
    * Notify observers of a change to an item that has been requested by the
    * user.
    */
-  _notifyAction: function(id, reason) {
+  _notifyAction: function EM__notifyAction(id, reason) {
     gOS.notifyObservers(this.datasource.getItemForID(id),
                         EM_ACTION_REQUESTED_TOPIC, reason);
   },
@@ -5466,7 +5471,7 @@ ExtensionManager.prototype = {
   /**
    * See nsIExtensionManager.idl
    */
-  update: function(items, itemCount, updateCheckType, listener) {
+  update: function EM_update(items, itemCount, updateCheckType, listener) {
     for (i = 0; i < itemCount; ++i) {
       var currItem = items[i];
       if (!currItem)
@@ -5490,7 +5495,7 @@ ExtensionManager.prototype = {
    * XXXrstrong - this method is not terribly useful and was added so we can
    * trigger this check from the additional timer used by blocklisting.
    */
-  checkForBlocklistChanges: function() {
+  checkForBlocklistChanges: function EM_checkForBlocklistChanges() {
     var ds = this.datasource;
     var items = this.getItemList(Ci.nsIUpdateItem.TYPE_ANY, { });
     for (var i = 0; i < items.length; ++i) {
@@ -5523,7 +5528,7 @@ ExtensionManager.prototype = {
    *          The GUID of the item to locate an Install Location for.
    * @returns The Install Location object where the item is stored.
    */
-  getInstallLocation: function(id) {
+  getInstallLocation: function EM_getInstallLocation(id) {
     var key = this.datasource.visibleItems[id];
     return key ? InstallLocations.get(this.datasource.visibleItems[id]) : null;
   },
@@ -5534,7 +5539,7 @@ ExtensionManager.prototype = {
    *          The GUID of the item to construct a nsIUpdateItem for.
    * @returns The nsIUpdateItem representing the item.
    */
-  getItemForID: function(id) {
+  getItemForID: function EM_getItemForID(id) {
     return this.datasource.getItemForID(id);
   },
 
@@ -5550,7 +5555,9 @@ ExtensionManager.prototype = {
    * @returns An array of installed nsIUpdateItems that depend on the item
    *          specified by the id parameter.
    */
-  getDependentItemListForID: function(id, includeDisabled, countRef) {
+  getDependentItemListForID: function EM_getDependentItemListForID(id,
+                                                                   includeDisabled,
+                                                                   countRef) {
     return this.datasource.getDependentItemListForID(id, includeDisabled, countRef);
   },
 
@@ -5562,13 +5569,16 @@ ExtensionManager.prototype = {
    *          The XPCJS reference to the number of items returned.
    * @returns An array of nsIUpdateItems matching the id/type filter.
    */
-  getItemList: function(type, countRef) {
+  getItemList: function EM_getItemList(type, countRef) {
     return this.datasource.getItemList(type, countRef);
   },
 
   /* See nsIExtensionManager.idl */
-  getIncompatibleItemList: function(id, appVersion, platformVersion, type, includeDisabled,
-                                    countRef) {
+  getIncompatibleItemList: function EM_getIncompatibleItemList(id, appVersion,
+                                                               platformVersion,
+                                                               type,
+                                                               includeDisabled,
+                                                               countRef) {
     var items = this.datasource.getIncompatibleItemList(id, appVersion ? appVersion : undefined,
                                                         platformVersion ? platformVersion : undefined,
                                                         type, includeDisabled);
@@ -5583,7 +5593,7 @@ ExtensionManager.prototype = {
    * @param   destinationID
    *          The ID of an item to move another item to.
    */
-  moveToIndexOf: function(movingID, destinationID) {
+  moveToIndexOf: function EM_moveToIndexOf(movingID, destinationID) {
     this.datasource.moveToIndexOf(movingID, destinationID);
   },
 
@@ -5598,7 +5608,7 @@ ExtensionManager.prototype = {
    * @param   isAscending
    *          true to sort ascending and false to sort descending
    */
-  sortTypeByProperty: function(type, propertyName, isAscending) {
+  sortTypeByProperty: function EM_sortTypeByProperty(type, propertyName, isAscending) {
     this.datasource.sortTypeByProperty(type, propertyName, isAscending);
   },
 
@@ -5616,7 +5626,7 @@ ExtensionManager.prototype = {
    *          wishes to cancel all active downloads and quit the application,
    *          false otherwise.
    */
-  _confirmCancelDownloadsOnQuit: function(subject) {
+  _confirmCancelDownloadsOnQuit: function EM__confirmCancelDownloadsOnQuit(subject) {
     // If user has already dismissed quit request, then do nothing
     if ((subject instanceof Ci.nsISupportsPRBool) && subject.data)
       return;
@@ -5652,7 +5662,7 @@ ExtensionManager.prototype = {
    *          wishes to cancel all active downloads and go offline, false
    *          otherwise.
    */
-  _confirmCancelDownloadsOnOffline: function(subject) {
+  _confirmCancelDownloadsOnOffline: function EM__confirmCancelDownloadsOnOffline(subject) {
     if (this._downloadCount > 0) {
       result = this._confirmCancelDownloads(this._downloadCount,
                                             "offlineCancelDownloadsAlertTitle",
@@ -5681,8 +5691,10 @@ ExtensionManager.prototype = {
    *          The key of the label to be displayed on the "Don't Cancel
    *          Downloads" button.
    */
-  _confirmCancelDownloads: function(count, title, cancelMessageMultiple,
-                                    cancelMessageSingle, dontCancelButton) {
+  _confirmCancelDownloads: function EM__confirmCancelDownloads(count, title,
+                                                               cancelMessageMultiple,
+                                                               cancelMessageSingle,
+                                                               dontCancelButton) {
     var bundle = BundleManager.getBundle(URI_DOWNLOADS_PROPERTIES);
     var title = bundle.GetStringFromName(title);
     var message, quitButton;
@@ -5709,7 +5721,7 @@ ExtensionManager.prototype = {
   },
 
   /* See nsIExtensionManager.idl */
-  addDownloads: function(items, itemCount, manager) {
+  addDownloads: function EM_addDownloads(items, itemCount, manager) {
     if (itemCount == 0)
       throw Cr.NS_ERROR_ILLEGAL_VALUE;
 
@@ -5788,7 +5800,7 @@ ExtensionManager.prototype = {
    * @param   value
    *          ???
    */
-  onStateChange: function(transaction, addon, state, value) {
+  onStateChange: function EM_onStateChange(transaction, addon, state, value) {
     var ds = this.datasource;
     var id = addon.id != addon.xpiURL ? PREFIX_ITEM_URI + addon.id : addon.xpiURL;
     const nsIXPIProgressDialog = Ci.nsIXPIProgressDialog;
@@ -5847,7 +5859,7 @@ ExtensionManager.prototype = {
     }
   },
 
-  onProgress: function(addon, value, maxValue) {
+  onProgress: function EM_onProgress(addon, value, maxValue) {
     for (var i = 0; i < this._installListeners.length; ++i)
       this._installListeners[i].onDownloadProgress(addon, value, maxValue);
 
@@ -5857,7 +5869,7 @@ ExtensionManager.prototype = {
   },
 
   _installListeners: [],
-  addInstallListener: function(listener) {
+  addInstallListener: function EM_addInstallListener(listener) {
     for (var i = 0; i < this._installListeners.length; ++i) {
       if (this._installListeners[i] == listener)
         return i;
@@ -5866,7 +5878,7 @@ ExtensionManager.prototype = {
     return this._installListeners.length - 1;
   },
 
-  removeInstallListenerAt: function(index) {
+  removeInstallListenerAt: function EM_removeInstallListenerAt(index) {
     this._installListeners.splice(index, 1);
   },
 
@@ -5882,7 +5894,7 @@ ExtensionManager.prototype = {
    * - on startup and there has been a change to an Install Location
    * ... it should NOT be called on every startup!
    */
-  _ensureDS: function() {
+  _ensureDS: function EM__ensureDS() {
     if (!this._ds) {
       this._ds = new ExtensionsDataSource(this);
       if (this._ds) {
@@ -5963,7 +5975,7 @@ ItemDownloadTransaction.prototype = {
    * @param   addon
    *          An object implementing nsIUpdateItem for the item to be downloaded
    */
-  addDownload: function(addon) {
+  addDownload: function ItemDownloadTransaction_addDownload(addon) {
     this._downloads.push({ addon: addon, waiting: true });
     this._manager.datasource.addDownload(addon);
   },
@@ -5973,14 +5985,14 @@ ItemDownloadTransaction.prototype = {
    * @param   url
    *          The URL to remove
    */
-  removeDownload: function(url) {
+  removeDownload: function ItemDownloadTransaction_removeDownload(url) {
     this._manager.datasource.removeDownload(url);
   },
 
   /**
    * Remove all downloads from this transaction
    */
-  removeAllDownloads: function() {
+  removeAllDownloads: function ItemDownloadTransaction_removeAllDownloads() {
     for (var i = 0; i < this._downloads.length; ++i) {
       var addon = this._downloads[i].addon;
       this.removeDownload(addon.xpiURL);
@@ -5993,7 +6005,7 @@ ItemDownloadTransaction.prototype = {
    *          The URL to look for
    * @returns true if this transaction is downloading the supplied url.
    */
-  containsURL: function(url) {
+  containsURL: function ItemDownloadTransaction_containsURL(url) {
     for (var i = 0; i < this._downloads.length; ++i) {
       if (this._downloads[i].addon.xpiURL == url)
         return true;
@@ -6004,7 +6016,7 @@ ItemDownloadTransaction.prototype = {
   /**
    * See nsIXPIProgressDialog.idl
    */
-  onStateChange: function(index, state, value) {
+  onStateChange: function ItemDownloadTransaction_onStateChange(index, state, value) {
     this._manager.onStateChange(this, this._downloads[index].addon,
                                 state, value);
   },
@@ -6012,7 +6024,7 @@ ItemDownloadTransaction.prototype = {
   /**
    * See nsIXPIProgressDialog.idl
    */
-  onProgress: function(index, value, maxValue) {
+  onProgress: function ItemDownloadTransaction_onProgress(index, value, maxValue) {
     this._manager.onProgress(this._downloads[index].addon, value, maxValue);
   },
 
@@ -6031,7 +6043,7 @@ BackgroundUpdateCheckListener.prototype = {
   _emDS: null,
 
   // nsIObserver implementation
-  observe: function(aSubject, aTopic, aData) {
+  observe: function BackgroundUpdateListener_observe(aSubject, aTopic, aData) {
     if (aTopic != "alertclickcallback")
       return;
 
@@ -6061,10 +6073,10 @@ BackgroundUpdateCheckListener.prototype = {
   },
   
   // nsIAddonUpdateCheckListener implementation
-  onUpdateStarted: function() {
+  onUpdateStarted: function BackgroundUpdateListener_onUpdateStarted() {
   },
 
-  onUpdateEnded: function() {
+  onUpdateEnded: function BackgroundUpdateListener_onUpdateEnded() {
     if (this._updateCount > 0 && Cc["@mozilla.org/alerts-service;1"]) {
       var extensionStrings = BundleManager.getBundle(URI_EXTENSIONS_PROPERTIES);
       var title = extensionStrings.GetStringFromName("updateNotificationTitle");
@@ -6089,10 +6101,10 @@ BackgroundUpdateCheckListener.prototype = {
     }
   },
 
-  onAddonUpdateStarted: function(item) {
+  onAddonUpdateStarted: function BackgroundUpdateListener_onAddonUpdateStarted(item) {
   },
 
-  onAddonUpdateEnded: function(item, status) {
+  onAddonUpdateEnded: function BackgroundUpdateListener_onAddonUpdateEnded(item, status) {
     if (status == Ci.nsIAddonUpdateCheckListener.STATUS_UPDATE) {
       var lastupdate = this._emDS.getItemProperty(item.id, "availableUpdateVersion");
       if (lastupdate != item.version) {
@@ -6116,25 +6128,25 @@ AddonUpdateCheckListener.prototype = {
   _listener: null,
   _ds: null,
 
-  onUpdateStarted: function() {
+  onUpdateStarted: function AddonUpdateListener_onUpdateStarted() {
     if (this._listener)
       this._listener.onUpdateStarted();
     this._ds.onUpdateStarted();
   },
 
-  onUpdateEnded: function() {
+  onUpdateEnded: function AddonUpdateListener_onUpdateEnded() {
     if (this._listener)
       this._listener.onUpdateEnded();
     this._ds.onUpdateEnded();
   },
 
-  onAddonUpdateStarted: function(addon) {
+  onAddonUpdateStarted: function AddonUpdateListener_onAddonUpdateStarted(addon) {
     if (this._listener)
       this._listener.onAddonUpdateStarted(addon);
     this._ds.onAddonUpdateStarted(addon);
   },
 
-  onAddonUpdateEnded: function(addon, status) {
+  onAddonUpdateEnded: function AddonUpdateListener_onAddonUpdateEnded(addon, status) {
     if (this._listener)
       this._listener.onAddonUpdateEnded(addon, status);
     this._ds.onAddonUpdateEnded(addon, status);
@@ -6188,8 +6200,10 @@ ExtensionItemUpdater.prototype = {
 #         we look ONLY for compatibility updates in this case to determine
 #         whether or not the item can be installed.
   */
-  checkForUpdates: function(aItems, aItemCount, aUpdateCheckType,
-                            aListener) {
+  checkForUpdates: function ExtensionItemUpdater_checkForUpdates(aItems,
+                                                                 aItemCount,
+                                                                 aUpdateCheckType,
+                                                                 aListener) {
     this._listener = new AddonUpdateCheckListener(aListener, this._emDS);
     if (this._listener)
       this._listener.onUpdateStarted();
@@ -6213,7 +6227,8 @@ ExtensionItemUpdater.prototype = {
 
   /////////////////////////////////////////////////////////////////////////////
   // ExtensionItemUpdater
-  _applyVersionUpdates: function(aLocalItem, aRemoteItem) {
+  _applyVersionUpdates: function ExtensionItemUpdater__applyVersionUpdates(aLocalItem,
+                                                                           aRemoteItem) {
     var targetAppInfo = this._emDS.getTargetApplicationInfo(aLocalItem.id, this._emDS);
     // If targetAppInfo is null this is for a new install. If the local item's
     // maxVersion does not equal the targetAppInfo maxVersion then this is for
@@ -6288,7 +6303,7 @@ ExtensionItemUpdater.prototype = {
     return true;
   },
 
-  checkForDone: function(item, status) {
+  checkForDone: function ExtensionItemUpdater_checkForDone(item, status) {
     if (this._listener) {
       try {
         this._listener.onAddonUpdateEnded(item, status);
@@ -6383,7 +6398,7 @@ RDFItemUpdater.prototype = {
   _updateCheckType    : 0,
   _item               : null,
 
-  checkForUpdates: function(aItem, aUpdateCheckType) {
+  checkForUpdates: function RDFItemUpdater_checkForUpdates(aItem, aUpdateCheckType) {
     // A preference setting can disable updating for this item
     try {
       if (!gPref.getBoolPref(PREF_EM_ITEM_UPDATE_ENABLED.replace(/%UUID%/, aItem.id))) {
@@ -6473,7 +6488,7 @@ RDFItemUpdater.prototype = {
     request.send(null);
   },
 
-  onXMLLoad: function(aEvent, aItem) {
+  onXMLLoad: function RDFItemUpdater_onXMLLoad(aEvent, aItem) {
     var request = aEvent.target;
     try {
       checkCert(request.channel);
@@ -6515,7 +6530,7 @@ RDFItemUpdater.prototype = {
     this.onDatasourceLoaded(ds, aItem);
   },
 
-  onXMLError: function(aEvent, aItem) {
+  onXMLError: function RDFItemUpdater_onXMLError(aEvent, aItem) {
     try {
       var request = aEvent.target;
       // the following may throw (e.g. a local file or timeout)
@@ -6542,7 +6557,7 @@ RDFItemUpdater.prototype = {
                                Ci.nsIAddonUpdateCheckListener.STATUS_FAILURE);
   },
 
-  onDatasourceLoaded: function(aDatasource, aLocalItem) {
+  onDatasourceLoaded: function RDFItemUpdater_onDatasourceLoaded(aDatasource, aLocalItem) {
     /*
 #      The extension update RDF file looks something like this:
 #
@@ -6698,7 +6713,10 @@ RDFItemUpdater.prototype = {
 
   // Get a compulsory property from a resource. Reports an error if the
   // property was not present.
-  _getPropertyFromResource: function(aDataSource, aSourceResource, aProperty, aLocalItem) {
+  _getPropertyFromResource: function RDFItemUpdater__getPropertyFromResource(aDataSource,
+                                                                             aSourceResource,
+                                                                             aProperty,
+                                                                             aLocalItem) {
     var rv;
     try {
       var property = gRDF.GetResource(EM_NS(aProperty));
@@ -6726,7 +6744,9 @@ RDFItemUpdater.prototype = {
    * @returns An nsIUpdateItem holding the update's information if a valid
    *          update is found or null if not.
    */
-  _parseV20UpdateInfo: function(aDataSource, aLocalItem, aUpdateCheckType) {
+  _parseV20UpdateInfo: function RDFItemUpdater__parseV20UpdateInfo(aDataSource,
+                                                                   aLocalItem,
+                                                                   aUpdateCheckType) {
     var extensionRes  = gRDF.GetResource(getItemPrefix(aLocalItem.type) + aLocalItem.id);
 
     var updatesArc = gRDF.GetResource(EM_NS("updates"));
@@ -6795,7 +6815,11 @@ RDFItemUpdater.prototype = {
    * @returns An nsIUpdateItem holding the update's information if a valid
    *          update is found or null if not.
    */
-  _parseV20Update: function(aDataSource, aUpdateResource, aLocalItem, aNewestVersionFound, aUpdateCheckType) {
+  _parseV20Update: function RDFItemUpdater__parseV20Update(aDataSource,
+                                                           aUpdateResource,
+                                                           aLocalItem,
+                                                           aNewestVersionFound,
+                                                           aUpdateCheckType) {
     var version = this._getPropertyFromResource(aDataSource, aUpdateResource,
                                                 "version", aLocalItem);
     /* If we are looking for new versions then test whether this discovered
@@ -6896,7 +6920,7 @@ RDFSerializer.prototype = {
    * @returns a string with all characters invalid in XML character data
    *          converted to entity references.
    */
-  escapeEntities: function(string)
+  escapeEntities: function RDFSerializer_escapeEntities(string)
   {
     string = string.replace(/&/g, "&amp;");
     string = string.replace(/</g, "&lt;");
@@ -6912,7 +6936,7 @@ RDFSerializer.prototype = {
    * @param indent     The current level of indent for pretty-printing
    * @returns a string containing the serialized elements.
    */
-  serializeContainerItems: function(ds, container, indent)
+  serializeContainerItems: function RDFSerializer_serializeContainerItems(ds, container, indent)
   {
     var result = "";
     var items = container.GetElements();
@@ -6934,7 +6958,7 @@ RDFSerializer.prototype = {
    * @param indent     The current level of indent for pretty-printing
    * @returns a string containing the serialized properties.
    */
-  serializeResourceProperties: function(ds, resource, indent)
+  serializeResourceProperties: function RDFSerializer_serializeResourceProperties(ds, resource, indent)
   {
     var result = "";
     var items = [];
@@ -6983,7 +7007,7 @@ RDFSerializer.prototype = {
    * @returns a string containing the serialized resource.
    * @throws if the RDF data contains multiple references to the same resource.
    */
-  serializeResource: function(ds, resource, indent)
+  serializeResource: function RDFSerializer_serializeResource(ds, resource, indent)
   {
     if (this.resources.indexOf(resource) != -1 ) {
       // We cannot output multiple references to the same resource.
@@ -7052,7 +7076,7 @@ ExtensionsDataSource.prototype = {
    * @returns true if the item's dependencies are satisfied.
    *          false if the item's dependencies are not satisfied.
    */
-  satisfiesDependencies: function(id) {
+  satisfiesDependencies: function EMDS_satisfiesDependencies(id) {
     var ds = this._inner;
     var itemResource = getResourceForID(id);
     var targets = ds.GetTargets(itemResource, EM_R("requires"), true);
@@ -7110,7 +7134,7 @@ ExtensionsDataSource.prototype = {
    * @returns true if the item is compatible with this version of the
    *          application, false, otherwise.
    */
-  isCompatible: function (datasource, source, appVersion, platformVersion) {
+  isCompatible: function EMDS_isCompatible(datasource, source, appVersion, platformVersion) {
     // The Default Theme is always compatible.
     if (source.EqualsNode(this._defaultTheme))
       return true;
@@ -7162,8 +7186,11 @@ ExtensionsDataSource.prototype = {
    * @returns An array of nsIUpdateItems that are incompatible with the application
    *          ID/Version supplied.
    */
-  getIncompatibleItemList: function(appID, appVersion, platformVersion,
-                                    desiredType, includeDisabled) {
+  getIncompatibleItemList: function EMDS_getIncompatibleItemList(appID,
+                                                                 appVersion,
+                                                                 platformVersion,
+                                                                 desiredType,
+                                                                 includeDisabled) {
     var items = [];
     var ctr = getContainer(this._inner, this._itemRoot);
     var elements = ctr.GetElements();
@@ -7209,8 +7236,10 @@ ExtensionsDataSource.prototype = {
    * @returns An array of nsIUpdateItems that are blocklisted with the application
    *          or toolkit version supplied.
    */
-  getBlocklistedItemList: function(appVersion, platformVersion, desiredType,
-                                   includeAppDisabled) {
+  getBlocklistedItemList: function EMDS_getBlocklistedItemList(appVersion,
+                                                               platformVersion,
+                                                               desiredType,
+                                                               includeAppDisabled) {
     if (!gBlocklist)
       gBlocklist = Cc["@mozilla.org/extensions/blocklist;1"].
                    getService(Ci.nsIBlocklistService);
@@ -7245,7 +7274,7 @@ ExtensionsDataSource.prototype = {
    *          if |id| is non-null, otherwise all items matching the specified
    *          type.
    */
-  getItemList: function(desiredType, countRef) {
+  getItemList: function EMDS_getItemList(desiredType, countRef) {
     var items = [];
     var ctr = getContainer(this, this._itemRoot);
     var elements = ctr.GetElements();
@@ -7272,7 +7301,9 @@ ExtensionsDataSource.prototype = {
    * @returns An array of installed nsIUpdateItems that depend on the item
    *          specified by the id parameter.
    */
-  getDependentItemListForID: function(id, includeDisabled, countRef) {
+  getDependentItemListForID: function EMDS_getDependentItemListForID(id,
+                                                                     includeDisabled,
+                                                                     countRef) {
     var items = [];
     var ds = this._inner;
     var ctr = getContainer(this, this._itemRoot);
@@ -7303,7 +7334,7 @@ ExtensionsDataSource.prototype = {
    *          The GUID of the item to construct a nsIUpdateItem for
    * @returns The nsIUpdateItem for the id.
    */
-  getItemForID: function(id) {
+  getItemForID: function EMDS_getItemForID(id) {
     if (!this.visibleItems[id])
       return null;
 
@@ -7335,7 +7366,7 @@ ExtensionsDataSource.prototype = {
    * @returns The string name of the Install Location where the item is
    *          installed.
    */
-  getInstallLocationKey: function(id) {
+  getInstallLocationKey: function EMDS_getInstallLocationKey(id) {
     return this.getItemProperty(id, "installLocation");
   },
 
@@ -7351,7 +7382,7 @@ ExtensionsDataSource.prototype = {
    * @param   newValue
    *          The RDF Node containing the new property value
    */
-  _setProperty: function(datasource, source, property, newValue) {
+  _setProperty: function EMDS__setProperty(datasource, source, property, newValue) {
     var oldValue = datasource.GetTarget(source, property, true);
     if (oldValue) {
       if (newValue)
@@ -7375,7 +7406,7 @@ ExtensionsDataSource.prototype = {
    *          "maxVersion"    The updated maximum version of the target
    *                          application that this item can run in
    */
-  getUpdatedTargetAppInfo: function(id) {
+  getUpdatedTargetAppInfo: function EMDS_getUpdatedTargetAppInfo(id) {
     // The default theme is always compatible so there is never update info.
     if (getResourceForID(id).EqualsNode(this._defaultTheme))
       return null;
@@ -7430,7 +7461,9 @@ ExtensionsDataSource.prototype = {
    *       their install manifest for compatibility with all apps using a
    *       specific release of the toolkit.
    */
-  setUpdatedTargetAppInfo: function(id, targetAppID, updatedMinVersion, updatedMaxVersion) {
+  setUpdatedTargetAppInfo: function EMDS_setUpdatedTargetAppInfo(id, targetAppID,
+                                                                 updatedMinVersion,
+                                                                 updatedMaxVersion) {
     // The default theme is always compatible so it is never updated.
     if (getResourceForID(id).EqualsNode(this._defaultTheme))
       return;
@@ -7486,7 +7519,7 @@ ExtensionsDataSource.prototype = {
    *          or null, if no target application data exists for the specified
    *          id in the supplied datasource.
    */
-  getTargetApplicationInfo: function(id, datasource) {
+  getTargetApplicationInfo: function EMDS_getTargetApplicationInfo(id, datasource) {
     var appID = gApp.ID;
     // The default theme is always compatible.
     if (getResourceForID(id).EqualsNode(this._defaultTheme)) {
@@ -7545,7 +7578,10 @@ ExtensionsDataSource.prototype = {
    *       their install manifest for compatibility with all apps using a
    *       specific release of the toolkit.
    */
-  setTargetApplicationInfo: function(id, targetAppID, minVersion, maxVersion, datasource) {
+  setTargetApplicationInfo: function EMDS_setTargetApplicationInfo(id, targetAppID,
+                                                                   minVersion,
+                                                                   maxVersion,
+                                                                   datasource) {
     var targetDataSource = datasource;
     if (!targetDataSource)
       targetDataSource = this._inner;
@@ -7586,7 +7622,7 @@ ExtensionsDataSource.prototype = {
    * @returns The literal value of the property, or undefined if there is no
    *          value.
    */
-  getItemProperty: function(id, property) {
+  getItemProperty: function EMDS_getItemProperty(id, property) {
     var item = getResourceForID(id);
     if (!item) {
       LOG("getItemProperty failing for lack of an item. This means getResourceForItem \
@@ -7606,7 +7642,7 @@ ExtensionsDataSource.prototype = {
    * @returns The literal value of the property, or undefined if there is no
    *          value.
    */
-  _getItemProperty: function(itemResource, property) {
+  _getItemProperty: function EMDS__getItemProperty(itemResource, property) {
     var target = this.GetTarget(itemResource, EM_R(property), true);
     var value = stringData(target);
     if (value === undefined)
@@ -7623,7 +7659,7 @@ ExtensionsDataSource.prototype = {
    * @param   propertyValue
    *          A nsIRDFLiteral value of the property to be set
    */
-  setItemProperty: function (id, propertyArc, propertyValue) {
+  setItemProperty: function EMDS_setItemProperty(id, propertyArc, propertyValue) {
     var item = getResourceForID(id);
     this._setProperty(this._inner, item, propertyArc, propertyValue);
     this.Flush();
@@ -7636,7 +7672,7 @@ ExtensionsDataSource.prototype = {
    * @param   properties
    *          A JS object which maps properties to values.
    */
-  setItemProperties: function (id, properties) {
+  setItemProperties: function EMDS_setItemProperties(id, properties) {
     var item = getResourceForID(id);
     for (var key in properties)
       this._setProperty(this._inner, item, EM_R(key), properties[key]);
@@ -7648,7 +7684,7 @@ ExtensionsDataSource.prototype = {
    * @param   id
    *          The GUID of the item
    */
-  insertItemIntoContainer: function(id) {
+  insertItemIntoContainer: function EMDS_insertItemIntoContainer(id) {
     // Get the target container and resource
     var ctr = getContainer(this._inner, this._itemRoot);
     var itemResource = getResourceForID(id);
@@ -7665,7 +7701,7 @@ ExtensionsDataSource.prototype = {
    * @param   id
    *          The GUID of the item
    */
-  removeItemFromContainer: function(id) {
+  removeItemFromContainer: function EMDS_removeItemFromContainer(id) {
     var ctr = getContainer(this._inner, this._itemRoot);
     var itemResource = getResourceForID(id);
     ctr.RemoveElement(itemResource, true);
@@ -7678,7 +7714,7 @@ ExtensionsDataSource.prototype = {
    * @param   id
    *          The GUID of the item
    */
-  removeCorruptItem: function(id) {
+  removeCorruptItem: function EMDS_removeCorruptItem(id) {
     this.removeItemMetadata(id);
     this.removeItemFromContainer(id);
     this.visibleItems[id] = null;
@@ -7690,7 +7726,7 @@ ExtensionsDataSource.prototype = {
    *          The RDF URI of the item.
    * @returns The RDF Resource of the removed entry
    */
-  removeCorruptDLItem: function(uri) {
+  removeCorruptDLItem: function EMDS_removeCorruptDLItem(uri) {
     var itemResource = gRDF.GetResource(uri);
     var ctr = getContainer(this._inner, this._itemRoot);
     if (ctr.IndexOf(itemResource) != -1) {
@@ -7711,7 +7747,8 @@ ExtensionsDataSource.prototype = {
    * @param   target
    *          The target resource to store the localized properties
    */
-  _addLocalizedMetadata: function(installManifest, sourceRes, targetRes)
+  _addLocalizedMetadata: function EMDS__addLocalizedMetadata(installManifest,
+                                                             sourceRes, targetRes)
   {
     var singleProps = ["name", "description", "creator", "homepageURL"];
 
@@ -7751,7 +7788,7 @@ ExtensionsDataSource.prototype = {
    * @param   installLocation
    *          The Install Location of the item.
    */
-  addItemMetadata: function(id, installManifest, installLocation) {
+  addItemMetadata: function EMDS_addItemMetadata(id, installManifest, installLocation) {
     var targetRes = getResourceForID(id);
     // Remove any temporary assertions used for the install process
     this._setProperty(this._inner, targetRes, EM_R("newVersion"), null);
@@ -7832,7 +7869,7 @@ ExtensionsDataSource.prototype = {
    * @param   id
    *          The GUID of the item
    */
-  removeItemMetadata: function(id) {
+  removeItemMetadata: function EMDS_removeItemMetadata(id) {
     var item = getResourceForID(id);
     var resources = ["targetApplication", "requires", "localized"];
     for (var i = 0; i < resources.length; ++i) {
@@ -7853,7 +7890,7 @@ ExtensionsDataSource.prototype = {
    * @param   resource
    *          The resource to clean.
    */
-  _cleanResource: function(resource) {
+  _cleanResource: function EMDS__cleanResource(resource) {
     // Remove outward arcs
     var arcs = this._inner.ArcLabelsOut(resource);
     while (arcs.hasMoreElements()) {
@@ -7876,7 +7913,7 @@ ExtensionsDataSource.prototype = {
    * @param   property
    *          The property (less EM_NS) to update.
    */
-  updateProperty: function(id, property) {
+  updateProperty: function EMDS_updateProperty(id, property) {
     var item = getResourceForID(id);
     this._updateProperty(item, property);
   },
@@ -7892,7 +7929,7 @@ ExtensionsDataSource.prototype = {
    * @param   property
    *          The property (less EM_NS) to update.
    */
-  _updateProperty: function(item, property) {
+  _updateProperty: function EMDS__updateProperty(item, property) {
     if (item) {
       var propertyResource = EM_R(property);
       var value = this.GetTarget(item, propertyResource, true);
@@ -7914,7 +7951,7 @@ ExtensionsDataSource.prototype = {
    * @param   destinationID
    *          The ID of an item to move another item to.
    */
-  moveToIndexOf: function(movingID, destinationID) {
+  moveToIndexOf: function EMDS_moveToIndexOf(movingID, destinationID) {
     var extensions = gRDF.GetResource(RDFURI_ITEM_ROOT);
     var ctr = getContainer(this._inner, extensions);
     var item = gRDF.GetResource(movingID);
@@ -7939,7 +7976,7 @@ ExtensionsDataSource.prototype = {
    * @param   isAscending
    *          true to sort ascending and false to sort descending
    */
-  sortTypeByProperty: function(type, propertyName, isAscending) {
+  sortTypeByProperty: function EMDS_sortTypeByProperty(type, propertyName, isAscending) {
     var items = [];
     var ctr = getContainer(this._inner, this._itemRoot);
     var elements = ctr.GetElements();
@@ -7996,7 +8033,7 @@ ExtensionsDataSource.prototype = {
    *          em item prefix so getProperty shouldn't be used.
    * @returns true if the item is an active download, false otherwise.
    */
-  isDownloadItem: function(id) {
+  isDownloadItem: function EMDS_isDownloadItem(id) {
     var downloadURL = stringData(this.GetTarget(gRDF.GetResource(id), EM_R("downloadURL"), true));
     return downloadURL && downloadURL != "";
   },
@@ -8007,7 +8044,7 @@ ExtensionsDataSource.prototype = {
    *          An object implementing nsIUpdateItem for the addon being
    *          downloaded.
    */
-  addDownload: function(addon) {
+  addDownload: function EMDS_addDownload(addon) {
     // Updates have already been added to the datasource so we just update the
     // download state.
     if (addon.id != addon.xpiURL) {
@@ -8041,7 +8078,7 @@ ExtensionsDataSource.prototype = {
    * @param   version
    *          The version of the item
    */
-  addIncompatibleUpdateItem: function(name, url, type, version) {
+  addIncompatibleUpdateItem: function EMDS_addIncompatibleUpdateItem(name, url, type, version) {
     var iconURL = (type == Ci.nsIUpdateItem.TYPE_THEME) ? URI_GENERIC_ICON_THEME :
                                                           URI_GENERIC_ICON_XPINSTALL;
     var extensionsStrings = BundleManager.getBundle(URI_EXTENSIONS_PROPERTIES);
@@ -8070,7 +8107,7 @@ ExtensionsDataSource.prototype = {
    * @param   url
    *          The URL string of the active download to be removed
    */
-  removeDownload: function(url) {
+  removeDownload: function EMDS_removeDownload(url) {
     var res = gRDF.GetResource(url);
     var ctr = getContainer(this._inner, this._itemRoot);
     if (ctr.IndexOf(res) != -1)
@@ -8095,7 +8132,7 @@ ExtensionsDataSource.prototype = {
    *          The current state in the installation process. If null the object
    *          is deleted from _progressData.
    */
-  updateDownloadState: function(id, state) {
+  updateDownloadState: function EMDS_updateDownloadState(id, state) {
     if (!state) {
       if (id in this._progressData)
         delete this._progressData[id];
@@ -8110,7 +8147,7 @@ ExtensionsDataSource.prototype = {
     this._updateProperty(item, "state");
   },
 
-  updateDownloadProgress: function(id, progress) {
+  updateDownloadProgress: function EMDS_updateDownloadProgress(id, progress) {
     if (!progress) {
       if (!(id in this._progressData))
         return;
@@ -8142,7 +8179,7 @@ ExtensionsDataSource.prototype = {
    * Walk the list of installed items and determine what the visible list is,
    * based on which items are visible at the highest priority locations.
    */
-  _buildVisibleItemList: function() {
+  _buildVisibleItemList: function EMDS__buildVisibleItemList() {
     var ctr = getContainer(this, this._itemRoot);
     var items = ctr.GetElements();
     while (items.hasMoreElements()) {
@@ -8165,7 +8202,7 @@ ExtensionsDataSource.prototype = {
    *          should only be updated if its priority is lower than the existing
    *          value.
    */
-  updateVisibleList: function(id, locationKey, forceReplace) {
+  updateVisibleList: function EMDS_updateVisibleList(id, locationKey, forceReplace) {
     if (id in this.visibleItems && this.visibleItems[id]) {
       var oldLocation = InstallLocations.get(this.visibleItems[id]);
       var newLocation = InstallLocations.get(locationKey);
@@ -8179,7 +8216,7 @@ ExtensionsDataSource.prototype = {
   /**
    * Load the Extensions Datasource from disk.
    */
-  loadExtensions: function() {
+  loadExtensions: function EMDS_loadExtensions() {
     var extensionsFile  = getFile(KEY_PROFILEDIR, [FILE_EXTENSIONS]);
     try {
       this._inner = gRDF.GetDataSourceBlocking(getURLSpecFromFile(extensionsFile));
@@ -8201,21 +8238,21 @@ ExtensionsDataSource.prototype = {
   /**
    * See nsIExtensionManager.idl
    */
-  onUpdateStarted: function() {
+  onUpdateStarted: function EMDS_onUpdateStarted() {
     LOG("Datasource: Update Started");
   },
 
   /**
    * See nsIExtensionManager.idl
    */
-  onUpdateEnded: function() {
+  onUpdateEnded: function EMDS_onUpdateEnded() {
     LOG("Datasource: Update Ended");
   },
 
   /**
    * See nsIExtensionManager.idl
    */
-  onAddonUpdateStarted: function(addon) {
+  onAddonUpdateStarted: function EMDS_onAddonUpdateStarted(addon) {
     if (!addon)
       throw Cr.NS_ERROR_INVALID_ARG;
 
@@ -8226,7 +8263,7 @@ ExtensionsDataSource.prototype = {
   /**
    * See nsIExtensionManager.idl
    */
-  onAddonUpdateEnded: function(addon, status) {
+  onAddonUpdateEnded: function EMDS_onAddonUpdateEnded(addon, status) {
     if (!addon)
       throw Cr.NS_ERROR_INVALID_ARG;
 
@@ -8253,11 +8290,11 @@ ExtensionsDataSource.prototype = {
     return "rdf:extensions";
   },
 
-  GetSource: function(property, target, truthValue) {
+  GetSource: function EMDS_GetSource(property, target, truthValue) {
     return this._inner.GetSource(property, target, truthValue);
   },
 
-  GetSources: function(property, target, truthValue) {
+  GetSources: function EMDS_GetSources(property, target, truthValue) {
     return this._inner.GetSources(property, target, truthValue);
   },
 
@@ -8272,7 +8309,7 @@ ExtensionsDataSource.prototype = {
    * @returns An RDF Resource to the URL discovered, or the fallback
    *          if the discovery failed.
    */
-  _getThemeImageURL: function(item, fileName, fallbackURL) {
+  _getThemeImageURL: function EMDS__getThemeImageURL(item, fileName, fallbackURL) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     var installLocation = this._em.getInstallLocation(id);
     if (!installLocation)
@@ -8293,7 +8330,7 @@ ExtensionsDataSource.prototype = {
   /**
    * Get the em:iconURL property (icon url of the item)
    */
-  _rdfGet_iconURL: function(item, property) {
+  _rdfGet_iconURL: function EMDS__rdfGet_iconURL(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     var type = this.getItemProperty(id, "type");
     if (type & Ci.nsIUpdateItem.TYPE_THEME)
@@ -8325,7 +8362,7 @@ ExtensionsDataSource.prototype = {
   /**
    * Get the em:previewImage property (preview image of the item)
    */
-  _rdfGet_previewImage: function(item, property) {
+  _rdfGet_previewImage: function EMDS__rdfGet_previewImage(item, property) {
     var type = this.getItemProperty(stripPrefix(item.Value, PREFIX_ITEM_URI), "type");
     if (type != -1 && type & Ci.nsIUpdateItem.TYPE_THEME)
       return this._getThemeImageURL(item, "preview.png", null);
@@ -8336,7 +8373,7 @@ ExtensionsDataSource.prototype = {
    * If we're in safe mode, the item is disabled by the user or app, or the
    * item is to be upgraded force the generic about dialog for the item.
    */
-  _rdfGet_aboutURL: function(item, property) {
+  _rdfGet_aboutURL: function EMDS__rdfGet_aboutURL(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     if (inSafeMode() || this.getItemProperty(id, "isDisabled") == "true" ||
         this.getItemProperty(id, "opType") == OP_NEEDS_UPGRADE)
@@ -8345,7 +8382,7 @@ ExtensionsDataSource.prototype = {
     return null;
   },
 
-  _rdfGet_installDate: function(item, property) {
+  _rdfGet_installDate: function EMDS__rdfGet_installDate(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     var key = this.getItemProperty(id, "installLocation");
     if (key && key in StartupCache.entries && id in StartupCache.entries[key] &&
@@ -8357,7 +8394,7 @@ ExtensionsDataSource.prototype = {
   /**
    * Get the em:compatible property (whether or not this item is compatible)
    */
-  _rdfGet_compatible: function(item, property) {
+  _rdfGet_compatible: function EMDS__rdfGet_compatible(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     var targetAppInfo = this.getTargetApplicationInfo(id, this);
     if (!targetAppInfo) {
@@ -8381,7 +8418,7 @@ ExtensionsDataSource.prototype = {
    * Get the providesUpdatesSecurely property (whether or not this item has a
    * secure update mechanism)
    */
-  _rdfGet_providesUpdatesSecurely: function(item, property) {
+  _rdfGet_providesUpdatesSecurely: function EMDS__rdfGet_providesUpdatesSecurely(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     if (this.getItemProperty(id, "updateKey") ||
         !this.getItemProperty(id, "updateURL") ||
@@ -8393,7 +8430,7 @@ ExtensionsDataSource.prototype = {
   /**
    * Get the em:blocklisted property (whether or not this item is blocklisted)
    */
-  _rdfGet_blocklisted: function(item, property) {
+  _rdfGet_blocklisted: function EMDS__rdfGet_blocklisted(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     var version = this.getItemProperty(id, "version");
     if (!gBlocklist)
@@ -8408,7 +8445,7 @@ ExtensionsDataSource.prototype = {
   /**
    * Get the em:state property (represents the current phase of an install).
    */
-  _rdfGet_state: function(item, property) {
+  _rdfGet_state: function EMDS__rdfGet_state(item, property) {
     var id = item.Value;
     if (id in this._progressData)
       return EM_L(this._progressData[id].state);
@@ -8420,7 +8457,7 @@ ExtensionsDataSource.prototype = {
    * progress which is updated repeastedly during a download we avoid
    * repeastedly writing it to the rdf file.
    */
-  _rdfGet_progress: function(item, property) {
+  _rdfGet_progress: function EMDS__rdfGet_progress(item, property) {
     var id = item.Value;
     if (id in this._progressData)
       return EM_I(this._progressData[id].progress);
@@ -8431,7 +8468,7 @@ ExtensionsDataSource.prototype = {
    * Get the em:appManaged property. This prevents extensions from hiding
    * extensions installed into locations other than the app-global location.
    */
-  _rdfGet_appManaged: function(item, property) {
+  _rdfGet_appManaged: function EMDS__rdfGet_appManaged(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     var locationKey = this.getItemProperty(id, "installLocation");
     if (locationKey != KEY_APP_GLOBAL)
@@ -8443,7 +8480,7 @@ ExtensionsDataSource.prototype = {
    * Get the em:hidden property. This prevents extensions from hiding
    * extensions installed into locations other than restricted locations.
    */
-  _rdfGet_hidden: function(item, property) {
+  _rdfGet_hidden: function EMDS__rdfGet_hidden(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     var installLocation = InstallLocations.get(this.getInstallLocationKey(id));
     if (!installLocation || !installLocation.restricted)
@@ -8455,7 +8492,7 @@ ExtensionsDataSource.prototype = {
    * Get the em:locked property. This prevents extensions from locking
    * extensions installed into locations other than restricted locations.
    */
-  _rdfGet_locked: function(item, property) {
+  _rdfGet_locked: function EMDS__rdfGet_locked(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     var installLocation = InstallLocations.get(this.getInstallLocationKey(id));
     if (!installLocation || !installLocation.restricted)
@@ -8468,7 +8505,7 @@ ExtensionsDataSource.prototype = {
    * dependencies not satisfied (e.g. dependency disabled, incorrect version,
    * not installed etc.), and literal string "true" for dependencies satisfied.
    */
-  _rdfGet_satisfiesDependencies: function(item, property) {
+  _rdfGet_satisfiesDependencies: function EMDS__rdfGet_satisfiesDependencies(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     if (this.satisfiesDependencies(id))
       return EM_L("true");
@@ -8479,7 +8516,7 @@ ExtensionsDataSource.prototype = {
    * Get the em:opType property (controls widget state for the EM UI)
    * from the Startup Cache (e.g. extensions.cache)
    */
-  _rdfGet_opType: function(item, property) {
+  _rdfGet_opType: function EMDS__rdfGet_opType(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     var key = this.getItemProperty(id, "installLocation");
     if (key in StartupCache.entries && id in StartupCache.entries[key] &&
@@ -8497,7 +8534,7 @@ ExtensionsDataSource.prototype = {
    *
    * to specify localized text for each of these properties.
    */
-  _getLocalizablePropertyValue: function(item, property) {
+  _getLocalizablePropertyValue: function EMDS__getLocalizablePropertyValue(item, property) {
     // These are localizable properties that a language pack supplied by the
     // Extension may override.
     var prefName = PREF_EM_EXTENSION_FORMAT.replace(/%UUID%/,
@@ -8523,32 +8560,32 @@ ExtensionsDataSource.prototype = {
   /**
    * Get the em:name property (name of the item)
    */
-  _rdfGet_name: function(item, property) {
+  _rdfGet_name: function EMDS__rdfGet_name(item, property) {
     return this._getLocalizablePropertyValue(item, property);
   },
 
   /**
    * Get the em:description property (description of the item)
    */
-  _rdfGet_description: function(item, property) {
+  _rdfGet_description: function EMDS__rdfGet_description(item, property) {
     return this._getLocalizablePropertyValue(item, property);
   },
 
   /**
    * Get the em:creator property (creator of the item)
    */
-  _rdfGet_creator: function(item, property) {
+  _rdfGet_creator: function EMDS__rdfGet_creator(item, property) {
     return this._getLocalizablePropertyValue(item, property);
   },
 
   /**
    * Get the em:homepageURL property (homepage URL of the item)
    */
-  _rdfGet_homepageURL: function(item, property) {
+  _rdfGet_homepageURL: function EMDS__rdfGet_homepageURL(item, property) {
     return this._getLocalizablePropertyValue(item, property);
   },
   
-  _rdfGet_availableUpdateInfo: function(item, property) {
+  _rdfGet_availableUpdateInfo: function EMDS__rdfGet_availableUpdateInfo(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     var uri = stringData(this._inner.GetTarget(item, EM_R("availableUpdateInfo"), true));
     if (uri) {
@@ -8562,7 +8599,7 @@ ExtensionsDataSource.prototype = {
    * Get the em:isDisabled property. This will be true if the item has a
    * appDisabled or a userDisabled property that is true or OP_NEEDS_ENABLE.
    */
-  _rdfGet_isDisabled: function(item, property) {
+  _rdfGet_isDisabled: function EMDS__rdfGet_isDisabled(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     if (this.getItemProperty(id, "userDisabled") == "true" ||
         this.getItemProperty(id, "appDisabled") == "true" ||
@@ -8572,7 +8609,7 @@ ExtensionsDataSource.prototype = {
     return EM_L("false");
   },
 
-  _rdfGet_addonID: function(item, property) {
+  _rdfGet_addonID: function EMDS__rdfGet_addonID(item, property) {
     var id = this._inner.GetTarget(item, EM_R("downloadURL"), true) ? item.Value :
                                                                       stripPrefix(item.Value, PREFIX_ITEM_URI);
     return EM_L(id);
@@ -8582,7 +8619,7 @@ ExtensionsDataSource.prototype = {
    * Get the em:updateable property - this specifies whether the item is
    * allowed to be updated
    */
-  _rdfGet_updateable: function(item, property) {
+  _rdfGet_updateable: function EMDS__rdfGet_updateable(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     var opType = this.getItemProperty(id, "opType");
     if (opType != OP_NONE || this.getItemProperty(id, "appManaged") == "true")
@@ -8601,7 +8638,7 @@ ExtensionsDataSource.prototype = {
   /**
    * See nsIRDFDataSource.idl
    */
-  GetTarget: function(source, property, truthValue) {
+  GetTarget: function EMDS_GetTarget(source, property, truthValue) {
     if (!source)
       return null;
 
@@ -8625,7 +8662,7 @@ ExtensionsDataSource.prototype = {
    *
    * to specify localized text for each of these properties.
    */
-  _getLocalizablePropertyValues: function(item, property) {
+  _getLocalizablePropertyValues: function EMDS__getLocalizablePropertyValues(item, property) {
     // These are localizable properties that a language pack supplied by the
     // Extension may override.
     var values = [];
@@ -8668,28 +8705,28 @@ ExtensionsDataSource.prototype = {
   /**
    * Get the em:developer property (developers of the extension)
    */
-  _rdfGets_developer: function(item, property) {
+  _rdfGets_developer: function EMDS__rdfGets_developer(item, property) {
     return this._getLocalizablePropertyValues(item, property);
   },
 
   /**
    * Get the em:translator property (translators of the extension)
    */
-  _rdfGets_translator: function(item, property) {
+  _rdfGets_translator: function EMDS__rdfGets_translator(item, property) {
     return this._getLocalizablePropertyValues(item, property);
   },
 
   /**
    * Get the em:contributor property (contributors to the extension)
    */
-  _rdfGets_contributor: function(item, property) {
+  _rdfGets_contributor: function EMDS__rdfGets_contributor(item, property) {
     return this._getLocalizablePropertyValues(item, property);
   },
 
   /**
    * See nsIRDFDataSource.idl
    */
-  GetTargets: function(source, property, truthValue) {
+  GetTargets: function EMDS_GetTargets(source, property, truthValue) {
     if (!source)
       return null;
 
@@ -8710,23 +8747,23 @@ ExtensionsDataSource.prototype = {
                : this._inner.GetTargets(source, property, truthValue);
   },
 
-  Assert: function(source, property, target, truthValue) {
+  Assert: function EMDS_Assert(source, property, target, truthValue) {
     this._inner.Assert(source, property, target, truthValue);
   },
 
-  Unassert: function(source, property, target) {
+  Unassert: function EMDS_Unassert(source, property, target) {
     this._inner.Unassert(source, property, target);
   },
 
-  Change: function(source, property, oldTarget, newTarget) {
+  Change: function EMDS_Change(source, property, oldTarget, newTarget) {
     this._inner.Change(source, property, oldTarget, newTarget);
   },
 
-  Move: function(oldSource, newSource, property, target) {
+  Move: function EMDS_Move(oldSource, newSource, property, target) {
     this._inner.Move(oldSource, newSource, property, target);
   },
 
-  HasAssertion: function(source, property, target, truthValue) {
+  HasAssertion: function EMDS_HasAssertion(source, property, target, truthValue) {
     if (!source || !property || !target)
       return false;
 
@@ -8737,7 +8774,7 @@ ExtensionsDataSource.prototype = {
   },
 
   _observers: [],
-  AddObserver: function(observer) {
+  AddObserver: function EMDS_AddObserver(observer) {
     for (var i = 0; i < this._observers.length; ++i) {
       if (this._observers[i] == observer)
         return;
@@ -8746,7 +8783,7 @@ ExtensionsDataSource.prototype = {
     this._inner.AddObserver(observer);
   },
 
-  RemoveObserver: function(observer) {
+  RemoveObserver: function EMDS_RemoveObserver(observer) {
     for (var i = 0; i < this._observers.length; ++i) {
       if (this._observers[i] == observer)
         this._observers.splice(i, 1);
@@ -8754,43 +8791,43 @@ ExtensionsDataSource.prototype = {
     this._inner.RemoveObserver(observer);
   },
 
-  ArcLabelsIn: function(node) {
+  ArcLabelsIn: function EMDS_ArcLabelsIn(node) {
     return this._inner.ArcLabelsIn(node);
   },
 
-  ArcLabelsOut: function(source) {
+  ArcLabelsOut: function EMDS_ArcLabelsOut(source) {
     return this._inner.ArcLabelsOut(source);
   },
 
-  GetAllResources: function() {
+  GetAllResources: function EMDS_GetAllResources() {
     return this._inner.GetAllResources();
   },
 
-  IsCommandEnabled: function(sources, command, arguments) {
+  IsCommandEnabled: function EMDS_IsCommandEnabled(sources, command, arguments) {
     return this._inner.IsCommandEnabled(sources, command, arguments);
   },
 
-  DoCommand: function(sources, command, arguments) {
+  DoCommand: function EMDS_DoCommand(sources, command, arguments) {
     this._inner.DoCommand(sources, command, arguments);
   },
 
-  GetAllCmds: function(source) {
+  GetAllCmds: function EMDS_GetAllCmds(source) {
     return this._inner.GetAllCmds(source);
   },
 
-  hasArcIn: function(node, arc) {
+  hasArcIn: function EMDS_hasArcIn(node, arc) {
     return this._inner.hasArcIn(node, arc);
   },
 
-  hasArcOut: function(source, arc) {
+  hasArcOut: function EMDS_hasArcOut(source, arc) {
     return this._inner.hasArcOut(source, arc);
   },
 
-  beginUpdateBatch: function() {
+  beginUpdateBatch: function EMDS_beginUpdateBatch() {
     return this._inner.beginUpdateBatch();
   },
 
-  endUpdateBatch: function() {
+  endUpdateBatch: function EMDS_endUpdateBatch() {
     return this._inner.endUpdateBatch();
   },
 
@@ -8801,13 +8838,13 @@ ExtensionsDataSource.prototype = {
     throw Cr.NS_ERROR_NOT_IMPLEMENTED;
   },
 
-  Init: function(uri) {
+  Init: function EMDS_Init(uri) {
   },
 
-  Refresh: function(blocking) {
+  Refresh: function EMDS_Refresh(blocking) {
   },
 
-  Flush: function() {
+  Flush: function EMDS_Flush() {
     // For some operations we block repeated flushing until all operations
     // are complete to reduce file accesses that can trigger bug 431065
     if (!gAllowFlush) {
@@ -8818,7 +8855,7 @@ ExtensionsDataSource.prototype = {
       this._inner.Flush();
   },
 
-  FlushTo: function(uri) {
+  FlushTo: function EMDS_FlushTo(uri) {
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIRDFDataSource,
@@ -8907,6 +8944,16 @@ function NSGetModule(compMgr, fileSpec)
   XPCOMUtils.generateModule([ExtensionManager, DatasourceModule, UpdateItem]);
 
 #if 0
+/**
+ * Logs a message and stack trace to the console.
+ * @param   string
+ *          The string to write to the console.
+ */
+function STACK(string) {
+  dump("*** " + string + "\n");
+  stackTrace(arguments.callee.caller.arguments, -1);
+}
+
 function stackTraceFunctionFormat(aFunctionName) {
   var classDelimiter = aFunctionName.indexOf("_");
   var className = aFunctionName.substr(0, classDelimiter);
@@ -8918,13 +8965,25 @@ function stackTraceFunctionFormat(aFunctionName) {
   return className + "::" + functionName;
 }
 
+function stackTraceArgumentsFormat(aArguments) {
+  arglist = "";
+  for (var i = 0; i < aArguments.length; i++) {
+    arglist += aArguments[i];
+    if (i < aArguments.length - 1)
+      arglist += ", ";
+  }
+  return arglist;
+}
+
 function stackTrace(aArguments, aMaxCount) {
   dump("=[STACKTRACE]=====================================================\n");
-  dump("*** at: " + stackTraceFunctionFormat(aArguments.callee.name) + "()\n");
+  dump("*** at: " + stackTraceFunctionFormat(aArguments.callee.name) + "(" +
+       stackTraceArgumentsFormat(aArguments) + ")\n");
   var temp = aArguments.callee.caller;
   var count = 0;
   while (temp) {
-    dump("***     " + stackTraceFunctionFormat(temp.name) + "()\n");
+    dump("***     " + stackTraceFunctionFormat(temp.name) + "(" +
+         stackTraceArgumentsFormat(temp.arguments) + ")\n");
 
     temp = temp.arguments.callee.caller;
     if (aMaxCount > 0 && ++count == aMaxCount)