diff --git a/common/content/buffer.js b/common/content/buffer.js
index 86ae0ab9..95ca70fe 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -43,7 +43,7 @@ function Buffer() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     // FIXME: This doesn't belong here.
-    let fontSize = util.computedStyle(document.getElementById(config.mainWindowID)).fontSize;
+    let fontSize = util.computedStyle(document.getElementById(config.mainWindowId)).fontSize;
 
     styles.registerSheet("chrome://liberator/skin/liberator.css");
     let error = styles.addSheet(true, "font-size", "chrome://liberator/content/buffer.xhtml",
diff --git a/common/content/configbase.js b/common/content/configbase.js
index eb670463..a08762a8 100644
--- a/common/content/configbase.js
+++ b/common/content/configbase.js
@@ -94,7 +94,7 @@ const configbase = { //{{{
     /**
      * @property {string} The ID of the application's main XUL window.
      */
-    mainWindowID: document.documentElement.id,
+    mainWindowId: document.documentElement.id,
 
     /**
      * @property {[[]]} An array of application specific mode specifications.
diff --git a/common/content/hints.js b/common/content/hints.js
index ed3f1493..eb97007e 100755
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -352,16 +352,16 @@ function Hints() //{{{
      *
      * By default highlights it green instead of yellow.
      *
-     * @param {number} newID The hint to make active.
-     * @param {number} oldID The currently active hint.
+     * @param {number} newId The hint to make active.
+     * @param {number} oldId The currently active hint.
      */
-    function showActiveHint(newID, oldID)
+    function showActiveHint(newId, oldId)
     {
-        let oldElem = validHints[oldID - 1];
+        let oldElem = validHints[oldId - 1];
         if (oldElem)
             setClass(oldElem, false);
 
-        let newElem = validHints[newID - 1];
+        let newElem = validHints[newId - 1];
         if (newElem)
             setClass(newElem, true);
     }
@@ -986,7 +986,7 @@ function Hints() //{{{
                     if (hintNumber == 0)
                         hintNumber = 1;
 
-                    let oldID = hintNumber;
+                    let oldId = hintNumber;
                     if (key == "<Tab>")
                     {
                         if (++hintNumber > validHints.length)
@@ -997,7 +997,7 @@ function Hints() //{{{
                         if (--hintNumber < 1)
                             hintNumber = validHints.length;
                     }
-                    showActiveHint(hintNumber, oldID);
+                    showActiveHint(hintNumber, oldId);
                     updateStatusline();
                     return;
 
diff --git a/muttator/content/config.js b/muttator/content/config.js
index cc911a37..c476ea90 100644
--- a/muttator/content/config.js
+++ b/muttator/content/config.js
@@ -45,7 +45,7 @@ const config = (function () //{{{
         name: name,
         hostApplication: host, // TODO: can this be found out otherwise? gBrandBundle.getString("brandShortName");
                                         // Yes, but it will be localized unlike all other strings. So, it's best left until we i18n liberator. --djk
-        get mainWindowID() this.isComposeWindow ? "msgcomposeWindow" : "messengerWindow",
+        get mainWindowId() this.isComposeWindow ? "msgcomposeWindow" : "messengerWindow",
 
         /*** optional options, there are checked for existence and a fallback provided  ***/
         features: ["hints", "mail", "marks", "addressbook", "tabs"],
@@ -67,7 +67,7 @@ const config = (function () //{{{
         get mailModes() [modes.NORMAL],
         // focusContent() focuses this widget
         get mainWidget() this.isComposeWindow ? document.getElementById("content-frame") : GetThreadTree(),
-        get visualbellWindow() document.getElementById(this.mainWindowID),
+        get visualbellWindow() document.getElementById(this.mainWindowId),
         styleableChrome: "chrome://messenger/content/messenger.xul,chrome://messenger/content/messengercompose/messengercompose.xul",
 
         autocommands: [["DOMLoad",         "Triggered when a page's DOM content has fully loaded"],
diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 45af9c42..d23fad2b 100644
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -49,7 +49,7 @@ const config = { //{{{
 
     get isPlayerWindow() SBGetBrowser().mCurrentTab == SBGetBrowser().mediaTab,
     // focusContent() focuses this widget gSongbirdWindowController takes care of the focus.
-    get visualbellWindow() document.getElementById(this.mainWindowID),
+    get visualbellWindow() document.getElementById(this.mainWindowId),
 
     styleableChrome: "chrome://gonzo/content/xul/mainplayer.xul",
 
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 896a3759..7568a3e4 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -754,12 +754,12 @@ function Player() // {{{
 
             while (propEnumerator.hasMore())
             {
-                let propertyID = propEnumerator.getNext();
+                let propertyId = propEnumerator.getNext();
 
-                if (propManager.getPropertyInfo(propertyID).userViewable)
+                if (propManager.getPropertyInfo(propertyId).userViewable)
                 {
-                    liberator.dump("PropertyID - "+propManager.getPropertyInfo(propertyID).id);
-                    properties.push(propManager.getPropertyInfo(propertyID).displayName);
+                    //liberator.dump("propertyId - " + propManager.getPropertyInfo(propertyId).id);
+                    properties.push(propManager.getPropertyInfo(propertyId).displayName);
                 }
             }