diff --git a/content/commands.js b/content/commands.js
index 9bc4d995..43bb8702 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1121,7 +1121,7 @@ vimperator.Commands = function() //{{{
 
             if (rhs)
             {
-                vimperator.mappings.add(new Map([vimperator.modes.NORMAL], [lhs],
+                vimperator.mappings.add(new vimperator.Map([vimperator.modes.NORMAL], [lhs],
                     function() { vimperator.events.feedkeys(rhs); }, { rhs: rhs }
                 ));
             }
@@ -1300,7 +1300,7 @@ vimperator.Commands = function() //{{{
                 if (/^:/.test(rhs))
                 {
                     vimperator.mappings.add(
-                        new Map([vimperator.modes.NORMAL], [lhs], function() { vimperator.execute(rhs); }, { rhs: rhs })
+                        new vimperator.Map([vimperator.modes.NORMAL], [lhs], function() { vimperator.execute(rhs); }, { rhs: rhs })
                     );
                 }
                 else
@@ -1315,7 +1315,7 @@ vimperator.Commands = function() //{{{
                     // is created not at runtime
                     if (map)
                         vimperator.mappings.add(
-                            new Map([vimperator.modes.NORMAL], [lhs], map.action, { flags: map.flags, rhs: rhs })
+                            new vimperator.Map([vimperator.modes.NORMAL], [lhs], map.action, { flags: map.flags, rhs: rhs })
                         );
                     else
                         vimperator.echoerr("E475: Invalid argument: " + "{rhs} must be a existing singular mapping");
diff --git a/content/mappings.js b/content/mappings.js
index 774fc683..4d7675f0 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-function Map(modes, cmds, action, extra_info) //{{{
+vimperator.Map = function(modes, cmds, action, extra_info) //{{{
 {
     if (!modes || (!cmds || !cmds.length) || !action)
         return null;
@@ -65,7 +65,7 @@ function Map(modes, cmds, action, extra_info) //{{{
     }
 }
 
-Map.prototype.hasName = function(name)
+vimperator.Map.prototype.hasName = function(name)
 {
     for (var i = 0; i < this.names.length; i++)
     {
@@ -78,7 +78,7 @@ Map.prototype.hasName = function(name)
 
 // Since we will add many Map-objects, we add some functions as prototypes
 // this will ensure we only have one copy of each function, not one for each object
-Map.prototype.execute = function(motion, count, argument)
+vimperator.Map.prototype.execute = function(motion, count, argument)
 {
     var args = [];
     if (this.flags & Mappings.flags.MOTION)
@@ -325,14 +325,14 @@ function Mappings() //{{{
     // Normal mode
     // {{{
     // vimperator management
-    addDefaultMap(new Map(anymode, ["<F1>"],
+    addDefaultMap(new vimperator.Map(anymode, ["<F1>"],
         function() { vimperator.help(null); },
         {
             short_help: "Open help window",
             help: "The default section is shown, if you need help for a specific topic, try <code class=\"command\">:help &lt;F1&gt;</code>."
         }
     ));
-    addDefaultMap(new Map(anymode, ["<Esc>", "<C-[>"],
+    addDefaultMap(new vimperator.Map(anymode, ["<Esc>", "<C-[>"],
         vimperator.events.onEscape,
         {
             short_help: "Focus content",
@@ -340,14 +340,14 @@ function Mappings() //{{{
                   "Also focuses the web page, in case a form field has focus and eats our key presses."
         }
     ));
-    addDefaultMap(new Map(any_non_insertmode, [":"],
+    addDefaultMap(new vimperator.Map(any_non_insertmode, [":"],
         function() { vimperator.commandline.open(":", "", vimperator.modes.EX); },
         {
             short_help: "Start command line mode",
             help: "In command line mode, you can perform extended commands, which may require arguments."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["i", "<Insert>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["i", "<Insert>"],
         function()
         {
             // setting this option triggers an observer
@@ -360,7 +360,7 @@ function Mappings() //{{{
             "If you want to select text in this mode, press <code class=\"mapping\">v</code> to start its Visual mode."
         }
     ));
-    addDefaultMap(new Map(anymode, ["<C-q>"],
+    addDefaultMap(new vimperator.Map(anymode, ["<C-q>"],
         function() { vimperator.modes.passAllKeys = true; },
         {
             short_help: "Temporarily quit Vimperator mode",
@@ -370,7 +370,7 @@ function Mappings() //{{{
                   "in this mode to the web page, prepend it with <code class=\"mapping\">&lt;C-v&gt;</code>."
         }
     ));
-    addDefaultMap(new Map(anymode, ["<C-v>"],
+    addDefaultMap(new vimperator.Map(anymode, ["<C-v>"],
         function() { vimperator.modes.passNextKey = true; },
         {
             short_help: "Pass through next key",
@@ -379,14 +379,14 @@ function Mappings() //{{{
                   "When Vimperator mode is temporarily disabled with <code class=\"mapping\">&lt;C-q&gt;</code>, <code class=\"mapping\">&lt;C-v&gt;</code> will pass the next key to Vimperator instead of the web page."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["<C-c>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-c>"],
         BrowserStop,
         {
             short_help: "Stop loading",
             help: "Stops loading the current web page."
         }
     ));
-    addDefaultMap(new Map(anymode, ["<Nop>"],
+    addDefaultMap(new vimperator.Map(anymode, ["<Nop>"],
         function() { return; },
         {
             short_help: "Do nothing",
@@ -395,7 +395,7 @@ function Mappings() //{{{
         }
     ));
 
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["]f"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["]f"],
         function(count) { vimperator.buffer.shiftFrameFocus(count > 1 ? count : 1, true); },
         {
             short_help: "Focus next frame",
@@ -403,7 +403,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["[f"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["[f"],
         function(count) { vimperator.buffer.shiftFrameFocus(count > 1 ? count : 1, false); },
         {
             short_help: "Focus previous frame",
@@ -411,14 +411,14 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["b"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["b"],
         function() { vimperator.commandline.open(":", "buffer! ", vimperator.modes.EX); },
         {
             short_help: "Open a prompt to switch buffers",
             help: "Typing the corresponding number switches to this buffer."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["B"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["B"],
         function() { vimperator.buffer.list(true); },
         {
             short_help: "Toggle buffer list",
@@ -426,7 +426,7 @@ function Mappings() //{{{
                   "WARNING: This mapping may be removed/changed in future."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["gb"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gb"],
         function(count) { vimperator.buffer.switchTo(null, null, count, false); },
         {
             short_help: "Repeat last :buffer[!] command",
@@ -434,7 +434,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["gB"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gB"],
         function(count) { vimperator.buffer.switchTo(null, null, count, true); },
         {
             short_help: "Repeat last :buffer[!] command in reverse direction",
@@ -442,7 +442,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["d"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["d"],
         function(count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, false, 0); },
         {
             short_help: "Delete current buffer (=tab)",
@@ -451,7 +451,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["D"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["D"],
         function(count) { vimperator.tabs.remove(getBrowser().mCurrentTab, count, true, 0); },
         {
             short_help: "Delete current buffer (=tab)",
@@ -460,14 +460,14 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["gh"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gh"],
         BrowserHome,
         {
             short_help: "Go home",
             help: "Opens the homepage in the current tab."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["gH"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gH"],
         function()
         {
             var homepages = gHomeButton.getHomePage();
@@ -480,7 +480,7 @@ function Mappings() //{{{
                   "Whether the new tab is activated or not depends on the <code class=\"option\">'activate'</code> option.<br/>"
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["gi"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gi"],
         function()
         {
             if (vimperator.buffer.lastInputField)
@@ -492,7 +492,7 @@ function Mappings() //{{{
             short_help: "Focus last used input field"
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["go"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["go"],
         function(arg) { vimperator.quickmarks.jumpTo(arg, vimperator.CURRENT_TAB) },
         {
             short_help: "Jump to a QuickMark in the current tab",
@@ -502,7 +502,7 @@ function Mappings() //{{{
             flags: Mappings.flags.ARGUMENT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["gn"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gn"],
         function(arg)
         {
             vimperator.quickmarks.jumpTo(arg,
@@ -518,7 +518,7 @@ function Mappings() //{{{
             flags: Mappings.flags.ARGUMENT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["gP"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gP"],
         function()
         {
             vimperator.open(readFromClipboard(),
@@ -530,7 +530,7 @@ function Mappings() //{{{
             help: "Works like <code class=\"mapping\">P</code>, but inverts the <code class=\"option\">'activate'</code> option."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["gt", "<C-n>", "<C-Tab>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gt", "<C-n>", "<C-Tab>"],
         function(count) { vimperator.tabs.select(count > 0 ? count -1: "+1", count > 0 ? false : true); },
         {
             short_help: "Go to the next tab",
@@ -538,7 +538,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["gT", "<C-p>", "<C-S-Tab>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gT", "<C-p>", "<C-S-Tab>"],
         function(count) { vimperator.tabs.select(count > 0 ? count -1: "-1", count > 0 ? false : true); },
         {
             short_help: "Go to the previous tab",
@@ -546,7 +546,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ['<C-^>', '<C-6>'],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ['<C-^>', '<C-6>'],
         function()
         {
             if (vimperator.tabs.getTab() == vimperator.tabs.alternate)
@@ -573,7 +573,7 @@ function Mappings() //{{{
             help: "The alternate tab is the last selected tab. This provides a quick method of toggling between two tabs."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["m"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["m"],
         function(arg)
         {
             if (/[^a-zA-Z]/.test(arg))
@@ -591,7 +591,7 @@ function Mappings() //{{{
             flags: Mappings.flags.ARGUMENT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["'", "`"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["'", "`"],
         function(arg) { vimperator.marks.jumpTo(arg) },
         {
             short_help: "Jump to the mark in the current buffer",
@@ -600,7 +600,7 @@ function Mappings() //{{{
             flags: Mappings.flags.ARGUMENT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["M"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["M"],
         function(arg)
         {
             if (/[^a-zA-Z0-9]/.test(arg))
@@ -619,28 +619,28 @@ function Mappings() //{{{
             flags: Mappings.flags.ARGUMENT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["o"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["o"],
         function() { vimperator.commandline.open(":", "open ", vimperator.modes.EX); },
         {
             short_help: "Open one or more URLs in the current tab",
             help: "See <code class=\"command\">:open</code> for more details."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["O"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["O"],
         function() { vimperator.commandline.open(":", "open " + vimperator.buffer.URL, vimperator.modes.EX); },
         {
             short_help: "Open one or more URLs in the current tab, based on current location",
             help: "Works like <code class=\"mapping\">o</code>, but preselects current URL in the <code class=\"command\">:open</code> query."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["p", "<MiddleMouse>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["p", "<MiddleMouse>"],
         function() { vimperator.open(readFromClipboard()); },
         {
             short_help: "Open (put) a URL based on the current clipboard contents in the current buffer",
             help: "You can also just select (for non-X11 users: copy) some non-URL text, and search for it with the default search engine or keyword (specified by the <code class=\"option\">'defsearch'</code> option) with <code class=\"mapping\">p</code>."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["P"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["P"],
         function()
         {
             vimperator.open(readFromClipboard(),
@@ -653,7 +653,7 @@ function Mappings() //{{{
                   "Whether the new buffer is activated, depends on the <code class=\"option\">'activate'</code> option."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["<C-l>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-l>"],
         function(count) { vimperator.commands.redraw(); },
         {
             short_help: "Redraw the screen",
@@ -661,21 +661,21 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["r"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["r"],
         function() { vimperator.tabs.reload(getBrowser().mCurrentTab, false); },
         {
             short_help: "Reload",
             help: "Forces reloading of the current page."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["R"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["R"],
         function() { vimperator.tabs.reload(getBrowser().mCurrentTab, true); },
         {
             short_help: "Reload while skipping the cache",
             help: "Forces reloading of the current page skipping the cache."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["t"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["t"],
         function() { vimperator.commandline.open(":", "tabopen ", vimperator.modes.EX); },
         {
             short_help: "Open one or more URLs in a new tab",
@@ -683,14 +683,14 @@ function Mappings() //{{{
                   "See <code class=\"command\">:tabopen</code> for more details."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["T"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["T"],
         function() { vimperator.commandline.open(":", "tabopen " + vimperator.buffer.URL, vimperator.modes.EX); },
         {
             short_help: "Open one or more URLs in a new tab, based on current location",
             help: "Works like <code class=\"mapping\">t</code>, but preselects current URL in the <code class=\"command\">:tabopen</code> query."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["u"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["u"],
         function(count) { vimperator.commands.undo("", false, count); },
         {
             short_help: "Undo closing of a tab",
@@ -698,7 +698,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["y"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["y"],
         function()
         {
             var url = vimperator.buffer.URL;
@@ -710,7 +710,7 @@ function Mappings() //{{{
             help: "When running in X11 the location is also put into the selection, which can be pasted with the middle mouse button."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["Y"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["Y"],
         function()
         {
             var sel = window.content.document.getSelection();
@@ -722,7 +722,7 @@ function Mappings() //{{{
         }
     ));
 
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["zi", "+"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["zi", "+"],
         function(count) { vimperator.buffer.zoomIn(count > 1 ? count : 1, false); },
         {
             short_help: "Enlarge text zoom of current web page",
@@ -730,7 +730,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["zm"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["zm"],
         function(count) { vimperator.buffer.zoomIn((count > 1 ? count : 1) * 3, false); },
         {
             short_help: "Enlarge text zoom of current web page by a larger amount",
@@ -738,7 +738,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["zo", "-"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["zo", "-"],
         function(count) { vimperator.buffer.zoomOut(count > 1 ? count : 1, false); },
         {
             short_help: "Reduce text zoom of current web page",
@@ -746,7 +746,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["zr"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["zr"],
         function(count) { vimperator.buffer.zoomOut((count > 1 ? count : 1) * 3, false); },
         {
             short_help: "Reduce text zoom of current web page by a larger amount",
@@ -754,7 +754,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["zz"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["zz"],
         function(count) { vimperator.buffer.textZoom = count > 1 ? count : 100; },
         {
             short_help: "Set text zoom value of current web page",
@@ -762,7 +762,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["zI"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["zI"],
         function(count) { vimperator.buffer.zoomIn(count > 1 ? count : 1, true); },
         {
             short_help: "Enlarge full zoom of current web page",
@@ -770,7 +770,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["zM"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["zM"],
         function(count) { vimperator.buffer.zoomIn((count > 1 ? count : 1) * 3, true); },
         {
             short_help: "Enlarge full zoom of current web page by a larger amount",
@@ -778,7 +778,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["zO"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["zO"],
         function(count) { vimperator.buffer.zoomOut(count > 1 ? count : 1, true); },
         {
             short_help: "Reduce full zoom of current web page",
@@ -786,7 +786,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["zR"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["zR"],
         function(count) { vimperator.buffer.zoomOut((count > 1 ? count : 1) * 3, true); },
         {
             short_help: "Reduce full zoom of current web page by a larger amount",
@@ -794,7 +794,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["zZ"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["zZ"],
         function(count) { vimperator.buffer.fullZoom = count > 1 ? count : 100; },
         {
             short_help: "Set full zoom value of current web page",
@@ -803,14 +803,14 @@ function Mappings() //{{{
         }
     ));
 
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["ZQ"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["ZQ"],
         function() { vimperator.quit(false); },
         {
             short_help: "Quit and don't save the session",
             help: "Works like <code class=\"command\">:qall</code>."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["ZZ"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["ZZ"],
         function() { vimperator.quit(true); },
         {
             short_help: "Quit and save the session",
@@ -820,20 +820,20 @@ function Mappings() //{{{
     ));
 
     // scrolling commands
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["0", "^"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["0", "^"],
         function() { vimperator.buffer.scrollStart(); },
         {
             short_help: "Scroll to the absolute left of the document",
             help: "Unlike in Vim, <code class=\"mapping\">0</code> and <code class=\"mapping\">^</code> work exactly the same way."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["$"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["$"],
         function() { vimperator.buffer.scrollEnd(); },
         {
             short_help: "Scroll to the absolute right of the document"
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["gg", "<Home>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gg", "<Home>"],
         function(count) { vimperator.buffer.scrollToPercentile(count >  0 ? count : 0); },
         {
             short_help: "Goto the top of the document",
@@ -841,7 +841,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["G", "<End>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["G", "<End>"],
         function(count) { vimperator.buffer.scrollToPercentile(count >= 0 ? count : 100); },
         {
             short_help: "Goto the end of the document",
@@ -849,7 +849,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["h", "<Left>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["h", "<Left>"],
         function(count) { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
         {
             short_help: "Scroll document to the left",
@@ -858,7 +858,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["j", "<Down>", "<C-e>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["j", "<Down>", "<C-e>"],
         function(count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
         {
             short_help: "Scroll document down",
@@ -867,7 +867,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["k", "<Up>", "<C-y>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["k", "<Up>", "<C-y>"],
         function(count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
         {
             short_help: "Scroll document up",
@@ -892,7 +892,7 @@ function Mappings() //{{{
             win.scrollBy(0, vimperator.buffer.pageHeight / 2 * direction);
         }
     }
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["<C-d>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-d>"],
         function(count) { scrollByScrollSize(count, 1); },
         {
             short_help: "Scroll window downwards in the buffer",
@@ -901,7 +901,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["<C-u>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-u>"],
         function(count) { scrollByScrollSize(count, -1); },
         {
             short_help: "Scroll window upwards in the buffer",
@@ -910,7 +910,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["l", "<Right>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["l", "<Right>"],
         function(count) { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
         {
             short_help: "Scroll document to the right",
@@ -919,7 +919,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["<C-b>", "<PageUp>", "<S-Space>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-b>", "<PageUp>", "<S-Space>"],
         function(count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
         {
             short_help: "Scroll up a full page",
@@ -927,7 +927,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["<C-f>", "<PageDown>", "<Space>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-f>", "<PageDown>", "<Space>"],
         function(count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
         {
             short_help: "Scroll down a full page",
@@ -937,7 +937,7 @@ function Mappings() //{{{
     ));
 
     // history manipulation and jumplist
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["<C-o>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-o>"],
         function(count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },
         {
             short_help: "Go to an older position in the jump list",
@@ -945,7 +945,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["<C-i>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["<C-i>"],
         function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
             short_help: "Go to a newer position in the jump list",
@@ -953,7 +953,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["H", "<A-Left>", "<M-Left>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["H", "<A-Left>", "<M-Left>"],
         function(count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },
         {
             short_help: "Go back in the browser history",
@@ -961,7 +961,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["L", "<A-Right>", "<M-Right>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["L", "<A-Right>", "<M-Right>"],
         function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
             short_help: "Go forward in the browser history",
@@ -986,7 +986,7 @@ function Mappings() //{{{
         else
             return false;
     }
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["gu", "<BS>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gu", "<BS>"],
         function(count)
         {
             var gocmd = "";
@@ -1009,7 +1009,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["gU", "<C-BS>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["gU", "<C-BS>"],
         function() { vimperator.open("..."); },
         {
             short_help: "Go to the root of the website",
@@ -1019,7 +1019,7 @@ function Mappings() //{{{
     ));
 
     // hint managment
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["f"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["f"],
         function() { vimperator.hints.enableHahMode(vimperator.modes.QUICK_HINT); },
         {
             short_help: "Start QuickHint mode",
@@ -1028,7 +1028,7 @@ function Mappings() //{{{
                   "If you write the hint in ALLCAPS, the hint is followed in a background tab."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["F"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["F"],
         function() { vimperator.hints.enableHahMode(vimperator.modes.ALWAYS_HINT); },
         {
             short_help: "Start AlwaysHint mode",
@@ -1038,7 +1038,7 @@ function Mappings() //{{{
                   "Also, most <code class=\"mapping\">Ctrl</code>-prefixed shortcut keys are available in this mode for navigation."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], [";"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], [";"],
         function() { vimperator.hints.enableHahMode(vimperator.modes.EXTENDED_HINT); },
         {
             short_help: "Start ExtendedHint mode",
@@ -1063,7 +1063,7 @@ function Mappings() //{{{
     ));
 
     // search management
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["/"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["/"],
         function() { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_FORWARD); },
         {
             short_help: "Search forward for a pattern",
@@ -1075,7 +1075,7 @@ function Mappings() //{{{
                   "\"\\L\" forces the entire page to be searched for a match."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["?"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["?"],
         function() { vimperator.search.openSearchDialog(vimperator.modes.SEARCH_BACKWARD); },
         {
             short_help: "Search backwards for a pattern",
@@ -1088,14 +1088,14 @@ function Mappings() //{{{
                   "NOTE: incremental searching currently only works in the forward direction."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["n"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["n"],
         function() { vimperator.search.findAgain(false); },
         {
             short_help: "Find next",
             help: "Repeat the last search 1 time (until count is supported)."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL], ["N"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["N"],
         function() { vimperator.search.findAgain(true); },
         {
             short_help: "Find previous",
@@ -1109,63 +1109,63 @@ function Mappings() //{{{
     // {{{
 
     // action keys
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["o"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["o"],
         function() { vimperator.hints.openHints(false, false); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["t"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["t"],
         function() { vimperator.hints.openHints(true,  false); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-w>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-w>"],
         function() { vimperator.hints.openHints(false, true ); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["s"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["s"],
         function() { vimperator.hints.saveHints(true); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["a"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["a"],
         function() { vimperator.hints.saveHints(false); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["y"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["y"],
         function() { vimperator.hints.yankUrlHints(); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["Y"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["Y"],
         function() { vimperator.hints.yankTextHints(); },
         {
             cancel_mode: true,
             always_active: false
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], [","],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], [","],
         function() { vimperator.input.buffer += ','; vimperator.hints.setCurrentState(0); },
         {
             cancel_mode: false,
             always_active: true
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], [":"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], [":"],
         function() { vimperator.commandline.open(':', '', vimperator.modes.EX); },
         {
             cancel_mode: false,
@@ -1174,7 +1174,7 @@ function Mappings() //{{{
     ));
 
     // movement keys
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-e>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-e>"],
         function(count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
         {
             cancel_mode: false,
@@ -1182,7 +1182,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-y>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-y>"],
         function(count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
         {
             cancel_mode: false,
@@ -1190,21 +1190,21 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<Home>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<Home>"],
         function() { vimperator.buffer.scrollTop(); },
         {
             cancel_mode: false,
             always_active: true
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<End>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<End>"],
         function() { vimperator.buffer.scrollBottom(); },
         {
             cancel_mode: false,
             always_active: true
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<PageUp>", "<C-b>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<PageUp>", "<C-b>"],
         function(count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
         {
             cancel_mode: false,
@@ -1212,7 +1212,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<PageDown>", "<C-f>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<PageDown>", "<C-f>"],
         function(count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
         {
             cancel_mode: false,
@@ -1220,7 +1220,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<Left>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<Left>"],
         function() { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
         {
             cancel_mode: false,
@@ -1228,7 +1228,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<Down>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<Down>"],
         function() { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
         {
             cancel_mode: false,
@@ -1236,7 +1236,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<Up>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<Up>"],
         function() { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
         {
             cancel_mode: false,
@@ -1244,7 +1244,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<Right>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<Right>"],
         function() { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
         {
             cancel_mode: false,
@@ -1254,14 +1254,14 @@ function Mappings() //{{{
     ));
 
     // tab management
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-n>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-n>"],
         function() { vimperator.tabs.select('+1', true); },
         {
             cancel_mode: true,
             always_active: true
         }
     )); // same as gt, but no count supported
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-p>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-p>"],
         function() { vimperator.tabs.select('-1', true); },
         {
             cancel_mode: true,
@@ -1270,7 +1270,7 @@ function Mappings() //{{{
     ));
 
     // navigation
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-o>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-o>"],
         function(count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
         {
             cancel_mode: false,
@@ -1278,7 +1278,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-i>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-i>"],
         function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
             cancel_mode: false,
@@ -1286,7 +1286,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-h>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-h>"],
         function(count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
         {
             cancel_mode: false,
@@ -1294,7 +1294,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-l>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-l>"],
         function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
         {
             cancel_mode: false,
@@ -1302,7 +1302,7 @@ function Mappings() //{{{
             flags: Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-d>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-d>"],
         function() { vimperator.tabs.remove(getBrowser().mCurrentTab, vimperator.input.count, false, 0); },
         {
             cancel_mode: true,
@@ -1311,21 +1311,21 @@ function Mappings() //{{{
     ));
 
     // cancel_mode hint mode keys
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-c>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-c>"],
         function() { ; },
         {
             cancel_mode: true,
             always_active: true
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-g>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-g>"],
         function() { ; },
         {
             cancel_mode: true,
             always_active: true
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.HINTS], ["<C-[>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.HINTS], ["<C-[>"],
         function() { ; },
         {
             cancel_mode: true,
@@ -1345,14 +1345,14 @@ function Mappings() //{{{
             .QueryInterface(Components.interfaces.nsISelectionController);
     
     }
-    addDefaultMap(new Map([vimperator.modes.CARET, vimperator.modes.TEXTAREA], ["v"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET, vimperator.modes.TEXTAREA], ["v"],
         function(count) { vimperator.modes.set(vimperator.modes.VISUAL, vimperator.mode); },
         {
             short_help: "Start visual mode",
             help: "Works for caret mode and textarea mode."
         }
     ));
-    addDefaultMap(new Map([vimperator.modes.CARET], ["j", "<Down>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET], ["j", "<Down>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1361,7 +1361,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.CARET], ["k", "<Up>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET], ["k", "<Up>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1371,7 +1371,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.CARET], ["h", "<Left>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET], ["h", "<Left>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1380,7 +1380,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.CARET], ["l", "<Right>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET], ["l", "<Right>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1390,7 +1390,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.CARET], ["b", "B", "<C-Left>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET], ["b", "B", "<C-Left>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1399,7 +1399,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.CARET], ["w", "W", "e", "<C-Right>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET], ["w", "W", "e", "<C-Right>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1409,7 +1409,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.CARET], ["<C-f>", "<PageDown>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET], ["<C-f>", "<PageDown>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1418,7 +1418,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.CARET], ["<C-b>", "<PageUp>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET], ["<C-b>", "<PageUp>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1427,25 +1427,25 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.CARET], ["gg", "<C-Home>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET], ["gg", "<C-Home>"],
         function(count) { getSelectionController().completeMove(false, false); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.CARET], ["G", "<C-End>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET], ["G", "<C-End>"],
         function(count) { getSelectionController().completeMove(true, false); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.CARET], ["0", "^", "<Home>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET], ["0", "^", "<Home>"],
         function(count) { getSelectionController().intraLineMove(false, false); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.CARET], ["$", "<End>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.CARET], ["$", "<End>"],
         function(count) { getSelectionController().intraLineMove(true, false); },
         { }
     ));
 
 
-    addDefaultMap(new Map([vimperator.modes.NORMAL, vimperator.modes.CARET, vimperator.modes.TEXTAREA], ["*"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL, vimperator.modes.CARET, vimperator.modes.TEXTAREA], ["*"],
         function(count)
         {
             vimperator.search.searchSubmitted(vimperator.buffer.getCurrentWord(), false);
@@ -1453,7 +1453,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.NORMAL, vimperator.modes.CARET, vimperator.modes.TEXTAREA], ["#"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL, vimperator.modes.CARET, vimperator.modes.TEXTAREA], ["#"],
         function(count)
         {
             vimperator.search.searchSubmitted(vimperator.buffer.getCurrentWord(), true);
@@ -1466,7 +1466,7 @@ function Mappings() //{{{
     // VISUAL mode
     // {{{
 
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["j", "<Down>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["j", "<Down>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1484,7 +1484,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["k", "<Up>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["k", "<Up>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1502,7 +1502,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["h", "<Left>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["h", "<Left>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1516,7 +1516,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["l", "<Right>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["l", "<Right>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1530,7 +1530,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["b", "B"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["b", "B"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1544,7 +1544,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["w", "W", "e"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["w", "W", "e"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1558,7 +1558,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["<C-f>", "<PageDown>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["<C-f>", "<PageDown>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1572,7 +1572,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["<C-b>", "<PageUp>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["<C-b>", "<PageUp>"],
         function(count)
         {
             if (count < 1) count = 1;
@@ -1586,7 +1586,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["gg", "<C-Home>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["gg", "<C-Home>"],
         function(count)
         {
             if (vimperator.modes.extended & vimperator.modes.TEXTAREA)
@@ -1596,7 +1596,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["G", "<C-End>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["G", "<C-End>"],
         function(count)
         {
             if (vimperator.modes.extended & vimperator.modes.TEXTAREA)
@@ -1606,7 +1606,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["0", "^", "<Home>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["0", "^", "<Home>"],
         function(count)
         {
             if (vimperator.modes.extended & vimperator.modes.TEXTAREA)
@@ -1616,7 +1616,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["$", "<End>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["$", "<End>"],
         function(count)
         {
             if (vimperator.modes.extended & vimperator.modes.TEXTAREA)
@@ -1626,7 +1626,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["c", "s"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["c", "s"],
         function(count)
         {
             if (vimperator.modes.extended & vimperator.modes.TEXTAREA)
@@ -1639,7 +1639,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["d"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["d"],
         function(count)
         {
             if (vimperator.modes.extended & vimperator.modes.TEXTAREA)
@@ -1652,7 +1652,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL], ["y"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL], ["y"],
         function(count)
         {
             if (vimperator.modes.extended & vimperator.modes.TEXTAREA)
@@ -1666,7 +1666,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.VISUAL, vimperator.modes.TEXTAREA], ["p"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.VISUAL, vimperator.modes.TEXTAREA], ["p"],
         function(count)
         {
             if (!(vimperator.modes.extended & vimperator.modes.CARET))
@@ -1687,11 +1687,11 @@ function Mappings() //{{{
     // Textarea mode
     // {{{
 
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["i", "<Insert>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["i", "<Insert>"],
         function(count) { vimperator.modes.set(vimperator.modes.INSERT, vimperator.modes.TEXTAREA); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["a"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["a"],
         function(count)
         {
             vimperator.editor.executeCommand("cmd_charNext", 1);
@@ -1699,7 +1699,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["I", "gI"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["I", "gI"],
         function(count)
         {
             vimperator.editor.executeCommand("cmd_beginLine", 1);
@@ -1707,7 +1707,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["A"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["A"],
         function(count)
         {
             vimperator.editor.executeCommand("cmd_endLine", 1);
@@ -1715,7 +1715,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["s"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["s"],
         function(count)
         {
             vimperator.editor.executeCommand("cmd_deleteCharForward", 1);
@@ -1723,7 +1723,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["S"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["S"],
         function(count)
         {
             vimperator.editor.executeCommand("cmd_deleteToEndOfLine", 1);
@@ -1732,7 +1732,7 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["C"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["C"],
         function(count)
         {
             vimperator.editor.executeCommand("cmd_deleteToEndOfLine", 1);
@@ -1740,11 +1740,11 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["v"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["v"],
         function(count) { vimperator.modes.set(vimperator.modes.VISUAL, vimperator.modes.TEXTAREA); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["V"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["V"],
         function(count)
         {
             vimperator.modes.set(vimperator.modes.VISUAL, vimperator.modes.TEXTAREA | vimperator.modes.LINE);
@@ -1753,63 +1753,63 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["u"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["u"],
         function(count) { vimperator.editor.executeCommand("cmd_undo", count); vimperator.mode = vimperator.modes.TEXTAREA; },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["<C-r>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["<C-r>"],
         function(count) { vimperator.editor.executeCommand("cmd_redo", count); vimperator.mode = vimperator.modes.TEXTAREA; },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["j", "<Down>", "<Return>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["j", "<Down>", "<Return>"],
         function(count) { vimperator.editor.executeCommand("cmd_lineNext", count); },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["k", "<Up>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["k", "<Up>"],
         function(count) { vimperator.editor.executeCommand("cmd_linePrevious", count); },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["h", "<Left>", "<BS>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["h", "<Left>", "<BS>"],
         function(count) { vimperator.editor.executeCommand("cmd_charPrevious", count); },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["l", "<Right>", "<Space>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["l", "<Right>", "<Space>"],
         function(count) { vimperator.editor.executeCommand("cmd_charNext", count); },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["w", "W", "e", "<C-Right>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["w", "W", "e", "<C-Right>"],
         function(count) { vimperator.editor.executeCommand("cmd_wordNext", count); },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["b", "B", "<C-Left>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["b", "B", "<C-Left>"],
         function(count) { vimperator.editor.executeCommand("cmd_wordPrevious", 1); },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["gg", "<C-Home>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["gg", "<C-Home>"],
         function(count) { vimperator.editor.executeCommand("cmd_moveTop", 1); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["G", "<C-End>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["G", "<C-End>"],
         function(count) { vimperator.editor.executeCommand("cmd_moveBottom", 1); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["0", "^", "<Home>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["0", "^", "<Home>"],
         function(count) { vimperator.editor.executeCommand("cmd_beginLine", 1); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["$", "<End>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["$", "<End>"],
         function(count) { vimperator.editor.executeCommand("cmd_endLine", 1); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["<C-f>", "<PageDown>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["<C-f>", "<PageDown>"],
         function(count) { vimperator.editor.executeCommand("cmd_movePageDown", count); },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["<C-b>", "<PageUp>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["<C-b>", "<PageUp>"],
         function(count) { vimperator.editor.executeCommand("cmd_movePageUp", count); },
         { flags: Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["o"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["o"],
         function(count)
         {
             vimperator.editor.executeCommand("cmd_endLine", 1);
@@ -1818,7 +1818,7 @@ function Mappings() //{{{
         },
         {  }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["O"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["O"],
         function(count)
         {
             vimperator.editor.executeCommand("cmd_beginLine", 1);
@@ -1830,7 +1830,7 @@ function Mappings() //{{{
     ));
 
     // no need to check if we are really in TEXTAREA mode, as findCharForward/Backward will return -1 otherwise
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA, vimperator.modes.VISUAL], ["f"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA, vimperator.modes.VISUAL], ["f"],
         function(count, arg)
         {
             var pos = vimperator.editor.findCharForward(arg, count);
@@ -1839,7 +1839,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.ARGUMENT | Mappings.flags.COUNT}
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA, vimperator.modes.VISUAL], ["F"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA, vimperator.modes.VISUAL], ["F"],
         function(count, arg)
         {
             var pos = vimperator.editor.findCharBackward(arg, count);
@@ -1848,7 +1848,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.ARGUMENT | Mappings.flags.COUNT}
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA, vimperator.modes.VISUAL], ["t"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA, vimperator.modes.VISUAL], ["t"],
         function(count, arg)
         {
             var pos = vimperator.editor.findCharForward(arg, count);
@@ -1857,7 +1857,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.ARGUMENT | Mappings.flags.COUNT}
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA, vimperator.modes.VISUAL], ["T"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA, vimperator.modes.VISUAL], ["T"],
         function(count, arg)
         {
             var pos = vimperator.editor.findCharBackward(arg, count);
@@ -1866,7 +1866,7 @@ function Mappings() //{{{
         },
         { flags: Mappings.flags.ARGUMENT | Mappings.flags.COUNT}
     ));
-    // addDefaultMap(new Map([vimperator.modes.TEXTAREA, vimperator.modes.VISUAL], [";"],
+    // addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA, vimperator.modes.VISUAL], [";"],
     //     function(count, arg)
     //     {
     //         var pos = vimperator.editor.findCharBackward(null, count);
@@ -1877,15 +1877,15 @@ function Mappings() //{{{
     // ));
     
     // commands which require a motion
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["d"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["d"],
         function(motion, count) { vimperator.editor.executeCommandWithMotion("d", motion, count); },
         { flags: Mappings.flags.MOTION | Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["c"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["c"],
         function(motion, count) { vimperator.editor.executeCommandWithMotion("c", motion, count); },
         { flags: Mappings.flags.MOTION | Mappings.flags.COUNT }
     ));
-    addDefaultMap(new Map([vimperator.modes.TEXTAREA], ["y"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.TEXTAREA], ["y"],
         function(motion, count) { vimperator.editor.executeCommandWithMotion("y", motion, count); },
         { flags: Mappings.flags.MOTION | Mappings.flags.COUNT }
     ));
@@ -1893,11 +1893,11 @@ function Mappings() //{{{
     // }}}
     // INSERT mode
     // {{{
-    addDefaultMap(new Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-w>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-w>"],
         function() { vimperator.editor.executeCommand("cmd_deleteWordBackward", 1); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-u>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-u>"],
         function()
         {
             // broken in FF3, deletes the wohle line:
@@ -1907,27 +1907,27 @@ function Mappings() //{{{
         },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-k>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-k>"],
         function() { vimperator.editor.executeCommand("cmd_deleteToEndOfLine", 1); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-a>", "<Home>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-a>", "<Home>"],
         function() { vimperator.editor.executeCommand("cmd_beginLine", 1); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-e>", "<End>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-e>", "<End>"],
         function() { vimperator.editor.executeCommand("cmd_endLine", 1); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-h>"], // let firefox handle <BS>
+    addDefaultMap(new vimperator.Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<C-h>"], // let firefox handle <BS>
         function() { vimperator.editor.executeCommand("cmd_deleteCharBackward", 1); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<S-Insert>"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.INSERT, vimperator.modes.COMMAND_LINE], ["<S-Insert>"],
         function() { vimperator.editor.pasteClipboard(); },
         { }
     ));
-    addDefaultMap(new Map([vimperator.modes.INSERT, vimperator.modes.TEXTAREA], ["<C-i>"], 
+    addDefaultMap(new vimperator.Map([vimperator.modes.INSERT, vimperator.modes.TEXTAREA], ["<C-i>"], 
         function() { vimperator.editor.editWithExternalEditor(); }, 
         { }
     ));