diff --git a/content/buffers.js b/content/buffers.js
index 951e2ba8..5f3493a4 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -260,7 +260,7 @@ vimperator.Buffer = function () //{{{
                 }
                 else
                 {
-                    var items = vimperator.completion.buffers("")[1];
+                    var items = vimperator.completion.buffer("")[1];
                     vimperator.bufferwindow.show(items);
                     vimperator.bufferwindow.selectItem(getBrowser().mTabContainer.selectedIndex);
                 }
@@ -268,7 +268,7 @@ vimperator.Buffer = function () //{{{
             else
             {
                 // TODO: move this to vimperator.buffers.get()
-                var items = vimperator.completion.buffers("")[1];
+                var items = vimperator.completion.buffer("")[1];
                 var number, indicator, title, url;
 
                 var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" + "<table>";
@@ -451,7 +451,7 @@ vimperator.Buffer = function () //{{{
             if (!vimperator.bufferwindow.visible())
                 return false;
 
-            var items = vimperator.completion.buffers("")[1];
+            var items = vimperator.completion.buffer("")[1];
             vimperator.bufferwindow.show(items);
             vimperator.bufferwindow.selectItem(getBrowser().mTabContainer.selectedIndex);
         },
diff --git a/content/commands.js b/content/commands.js
index a6690b3d..af18a6ed 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -653,7 +653,7 @@ vimperator.Commands = function () //{{{
                   "it is selected. With <code class=\"argument\">[!]</code> the next buffer matching the argument " +
                   "is selected, even if it cannot be identified uniquely.<br/>" +
                   "Use <code class=\"mapping\">b</code> as a shortcut to open this prompt.",
-            completer: function (filter) { return vimperator.completion.buffers(filter); }
+            completer: function (filter) { return vimperator.completion.buffer(filter); }
         }
     ));
     commandManager.add(new vimperator.Command(["dia[log]"],
@@ -1937,7 +1937,7 @@ vimperator.Commands = function () //{{{
                   "<code class=\"command\">:set option+={value}</code>, <code class=\"command\">:set option^={value}</code> and <code class=\"command\">:set option-={value}</code> " +
                   "adds/multiplies/subtracts <code class=\"argument\">{value}</code> from a number option and appends/prepends/removes <code class=\"argument\">{value}</code> from a string option.<br/>" +
                   "<code class=\"command\">:set all</code> shows the current value of all options and <code class=\"command\">:set all&amp;</code> resets all options to their default values.<br/>",
-            completer: function (filter) { return vimperator.completion.options(filter); }
+            completer: function (filter) { return vimperator.completion.option(filter); }
         }
     ));
     // TODO: sclose instead?
@@ -2036,7 +2036,7 @@ vimperator.Commands = function () //{{{
             help: "Works only for commands that support it, currently:" +
                   "<ul><li>:tab help</li>" +
                   "<li>:tab prefs[!]</li></ul>",
-            completer: function (filter) { return vimperator.completion.commands(filter); }
+            completer: function (filter) { return vimperator.completion.command(filter); }
         }
     ));
     commandManager.add(new vimperator.Command(["tabl[ast]"],
diff --git a/content/completion.js b/content/completion.js
index 7729caa1..f9a48e98 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -264,7 +264,7 @@ vimperator.Completion = function () //{{{
             substrings = [];
             for (var command in vimperator.commands)
                 helpArray.push([command.longNames.map(function ($_) { return ":" + $_; }), command.shortHelp]);
-            options = this.options(filter, true);
+            options = this.option(filter, true);
             helpArray = helpArray.concat(options.map(function ($_) {
                 return [
                         $_[0].map(function ($_) { return "'" + $_ + "'"; }),
@@ -281,7 +281,7 @@ vimperator.Completion = function () //{{{
             return [0, buildLongestCommonSubstring(helpArray, filter)];
         },
 
-        commands: function (filter)
+        command: function (filter)
         {
             substrings = [];
             var completions = [];
@@ -298,7 +298,7 @@ vimperator.Completion = function () //{{{
             return [0, buildLongestStartingSubstring(completions, filter)];
         },
 
-        options: function (filter, unfiltered)
+        option: function (filter, unfiltered)
         {
             substrings = [];
             var optionCompletions = [];
@@ -377,7 +377,7 @@ vimperator.Completion = function () //{{{
         },
 
         // FIXME: items shouldn't be [[[a], b]], but [[a, b]] and only mapped if at all for bLCS --mst
-        buffers: function (filter)
+        buffer: function (filter)
         {
             substrings = [];
             var items = [];
@@ -642,7 +642,7 @@ vimperator.Completion = function () //{{{
             // then get completions of the command name
             var matches = str.match(/^(:*\d*)\w*$/);
             if (matches)
-                return [matches[1].length, this.commands(cmd)[1]];
+                return [matches[1].length, this.command(cmd)[1]];
                 
             // dynamically get completions as specified with the command's completer function
             var command = vimperator.commands.get(cmd);