diff --git a/common/content/events.js b/common/content/events.js
index 3e643cdc..8774e797 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1750,14 +1750,14 @@ function Events() //{{{
                     this._branch.removeObserver("", this);
             },
 
-            observe: function (aSubject, aTopic, aData)
+            observe: function (subject, topic, data)
             {
-                if (aTopic != "nsPref:changed")
+                if (topic != "nsPref:changed")
                     return;
 
-                // aSubject is the nsIPrefBranch we're observing (after appropriate QI)
-                // aData is the name of the pref that's been changed (relative to aSubject)
-                switch (aData)
+                // subject is the nsIPrefBranch we're observing (after appropriate QI)
+                // data is the name of the pref that's been changed (relative to subject)
+                switch (data)
                 {
                     case "accessibility.browsewithcaret":
                         let value = options.getPref("accessibility.browsewithcaret", false);
diff --git a/muttator/content/config.js b/muttator/content/config.js
index b83cf099..a9c7980a 100644
--- a/muttator/content/config.js
+++ b/muttator/content/config.js
@@ -187,9 +187,9 @@ const config = { //{{{
 
             var stateListener =
             {
-                QueryInterface: function (aIID)
+                QueryInterface: function (id)
                 {
-                    if (aIID.equals(Components.interfaces.nsIDocumentStateListener))
+                    if (id.equals(Components.interfaces.nsIDocumentStateListener))
                         return this;
                     throw Components.results.NS_NOINTERFACE;
                 },
diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js
index cec44ff3..fc3b578b 100644
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -601,19 +601,19 @@ function Bookmarks() //{{{
         getSearchURL: function getSearchURL(text, useDefsearch)
         {
             let url = null;
-            let aPostDataRef = {};
+            let postData = {};
             let searchString = (useDefsearch ? options["defsearch"] + " " : "") + text;
 
             // we need to make sure our custom alias have been set, even if the user
             // did not :open <tab> once before
             this.getSearchEngines();
 
-            url = window.getShortcutOrURI(searchString, aPostDataRef);
+            url = window.getShortcutOrURI(searchString, postData);
             if (url == searchString)
                 url = null;
 
-            if (aPostDataRef && aPostDataRef.value)
-                return [url, aPostDataRef.value];
+            if (postData && postData.value)
+                return [url, postData.value];
             else
                 return url; // can be null
         },
diff --git a/xulmus/content/bookmarks.js b/xulmus/content/bookmarks.js
index 184457e6..4daf5530 100644
--- a/xulmus/content/bookmarks.js
+++ b/xulmus/content/bookmarks.js
@@ -601,13 +601,14 @@ function Bookmarks() //{{{
         getSearchURL: function getSearchURL(text, useDefsearch)
         {
             let url = null;
-            let aPostDataRef = {};
+            let postData = {};
             let searchString = (useDefsearch ? options["defsearch"] + " " : "") + text;
 
             // we need to make sure our custom alias have been set, even if the user
             // did not :open <tab> once before
             this.getSearchEngines();
 
+            // ripped from Firefox
             function getShortcutOrURI(aURL, aPostDataRef)
             {
                 var shortcutURL = null;
@@ -676,13 +677,13 @@ function Bookmarks() //{{{
                     return shortcutURL;
             }
 
-            url = getShortcutOrURI(searchString, aPostDataRef);
+            url = getShortcutOrURI(searchString, postData);
 
             if (url == searchString)
                 url = null;
 
-            if (aPostDataRef && aPostDataRef.value)
-                return [url, aPostDataRef.value];
+            if (postData && postData.value)
+                return [url, postData.value];
             else
                 return url; // can be null
         },