diff --git a/chrome/content/vimperator/hints.js b/chrome/content/vimperator/hints.js
index 33f2abe9..8c2ceb80 100644
--- a/chrome/content/vimperator/hints.js
+++ b/chrome/content/vimperator/hints.js
@@ -22,7 +22,7 @@
  *
 }}} ***** END LICENSE BLOCK *****/
 
-function hit_a_hint() //{{{
+function Hints() //{{{
 {
     const HINT_PREFIX = 'hah_hint_'; // prefix for the hint id
 
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index ef548d30..2b8390f7 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -42,39 +42,39 @@ function init() //{{{
 {
     window.dump("Vimperator init\n");
     // init the main object
-    vimperator = new Vimperator;
+    vimperator = new Vimperator();
     vimperator.log("Initializing vimperator object...", 1);
 
     // these inner classes are created here, because outside the init()
     // function, the chrome:// is not ready
     vimperator.log("Loading module options...", 3);
-    Vimperator.prototype.options       = new Options;
+    Vimperator.prototype.options       = new Options();
     vimperator.log("Loading module events...", 3);
-    Vimperator.prototype.events        = new Events;
+    Vimperator.prototype.events        = new Events();
     vimperator.log("Loading module commands...", 3);
-    Vimperator.prototype.commands      = new Commands;
+    Vimperator.prototype.commands      = new Commands();
     vimperator.log("Loading module bookmarks...", 3);
-    Vimperator.prototype.bookmarks     = new Bookmarks;
+    Vimperator.prototype.bookmarks     = new Bookmarks();
     vimperator.log("Loading module history...", 3);
-    Vimperator.prototype.history       = new History;
+    Vimperator.prototype.history       = new History();
     vimperator.log("Loading module commandline...", 3);
-    Vimperator.prototype.commandline   = new CommandLine;
+    Vimperator.prototype.commandline   = new CommandLine();
     vimperator.log("Loading module search...", 3);
-    Vimperator.prototype.search        = new Search;
+    Vimperator.prototype.search        = new Search();
     vimperator.log("Loading module preview window...", 3);
     Vimperator.prototype.previewwindow = new InformationList("vimperator-previewwindow", { incremental_fill: false, max_items: 10 });
     vimperator.log("Loading module buffer window...", 3);
     Vimperator.prototype.bufferwindow  = new InformationList("vimperator-bufferwindow", { incremental_fill: false, max_items: 10 });
     vimperator.log("Loading module mappings...", 3);
-    Vimperator.prototype.mappings      = new Mappings;
+    Vimperator.prototype.mappings      = new Mappings();
     vimperator.log("Loading module statusline...", 3);
-    Vimperator.prototype.statusline    = new StatusLine;
+    Vimperator.prototype.statusline    = new StatusLine();
     vimperator.log("Loading module tabs...", 3);
-    Vimperator.prototype.tabs          = new Tabs;
+    Vimperator.prototype.tabs          = new Tabs();
     vimperator.log("Loading module marks...", 3);
-    Vimperator.prototype.marks         = new Marks;
+    Vimperator.prototype.marks         = new Marks();
     vimperator.log("Loading module hints...", 3);
-    vimperator.hints = new hit_a_hint();
+    Vimperator.prototype.hints         = new Hints();
     vimperator.log("All modules loaded", 3);
 
     // DJK FIXME