diff --git a/content/httpmonitor/app/httpMonitor.js b/content/httpmonitor/app/httpMonitor.js
index 3a8adf6..6c0aa11 100644
--- a/content/httpmonitor/app/httpMonitor.js
+++ b/content/httpmonitor/app/httpMonitor.js
@@ -19,7 +19,7 @@ define([
 
     // These are independent modules. We don't actually need to reference them, but
     // they need to be loaded.
-    "httpmonitor/chrome/infotip",
+    "httpmonitor/chrome/infoTip",
     "httpmonitor/net/netPanel",
     "httpmonitor/cache/tabCacheModel",
 ],
diff --git a/content/httpmonitor/chrome/infotip.js b/content/httpmonitor/chrome/infoTip.js
similarity index 98%
rename from content/httpmonitor/chrome/infotip.js
rename to content/httpmonitor/chrome/infoTip.js
index bb3d907..35a0d48 100644
--- a/content/httpmonitor/chrome/infotip.js
+++ b/content/httpmonitor/chrome/infoTip.js
@@ -254,7 +254,7 @@ var InfoTip = Obj.extend(Module,
             }
 
             if (FBTrace.DBG_INFOTIP)
-                FBTrace.sysout("infotip.showInfoTip; top: " + infoTip.style.top +
+                FBTrace.sysout("infoTip.showInfoTip; top: " + infoTip.style.top +
                     ", left: " + infoTip.style.left + ", bottom: " + infoTip.style.bottom +
                     ", right:" + infoTip.style.right + ", offsetHeight: " + infoTip.offsetHeight +
                     ", offsetWidth: " + infoTip.offsetWidth +
@@ -316,7 +316,7 @@ var InfoTip = Obj.extend(Module,
         var fontObject = Fonts.getFontInfo(null, null, fontName.replace(/"/g, ""));
 
         if (FBTrace.DBG_INFOTIP)
-            FBTrace.sysout("infotip.populateFontFamilyInfoTip;", {fontName: fontName,
+            FBTrace.sysout("infoTip.populateFontFamilyInfoTip;", {fontName: fontName,
                 fontObject: fontObject});
 
         var node = this.tags.fontFamilyTag.replace({fontStyles: fontStyles, fontName: fontName,
diff --git a/content/httpmonitor/net/netPanel.js b/content/httpmonitor/net/netPanel.js
index 8b93da1..805fec2 100644
--- a/content/httpmonitor/net/netPanel.js
+++ b/content/httpmonitor/net/netPanel.js
@@ -207,7 +207,7 @@ NetPanel.prototype = Obj.extend(Panel,
 
         this.showToolbarButtons("fbNetButtons", false);
 
-        delete this.infoTipURL;  // clear the state that is tracking the infotip so it is reset after next show()
+        delete this.infoTipURL;  // clear the state that is tracking the infoTip so it is reset after next show()
         this.wasScrolledToBottom = Dom.isScrolledToBottom(this.panelNode);
 
         clearInterval(this.layoutInterval);
diff --git a/locale/en-US/httpmonitor.properties b/locale/en-US/httpmonitor.properties
index c913f6a..09eaa3c 100644
--- a/locale/en-US/httpmonitor.properties
+++ b/locale/en-US/httpmonitor.properties
@@ -273,7 +273,7 @@ filter.Images=Images
 filter.Flash=Flash
 
 # LOCALIZATION NOTE (failedToPreviewObjectURL, failedToPreviewImageURL):
-# Label used in an image preview infotip in the HTML panel when hovering over an <img> element
+# Label used in an image preview infoTip in the HTML panel when hovering over an <img> element
 # when loading of the given URL fails. The failedToPreviewObjectURL is specifically used
 # for moz-filedata (HTML5),
 # see: https://developer.mozilla.org/en/Using_files_from_web_applications#Example.3a_Using_object_URLs_to_display_images