diff --git a/common/content/abbreviations.js b/common/content/abbreviations.js
index 98fee9c4..71e6c93b 100644
--- a/common/content/abbreviations.js
+++ b/common/content/abbreviations.js
@@ -376,8 +376,9 @@ var Abbreviations = Module("abbreviations", {
         }
 
         addAbbreviationCommands([modes.INSERT, modes.COMMAND_LINE], "", "");
-        addAbbreviationCommands([modes.INSERT], "i", "INSERT");
-        addAbbreviationCommands([modes.COMMAND_LINE], "c", "COMMAND_LINE");
+        [modes.INSERT, modes.COMMAND_LINE].forEach(function (mode) {
+            addAbbreviationCommands([mode], mode.char, mode.displayName);
+        });
     }
 });
 
diff --git a/common/content/mappings.js b/common/content/mappings.js
index 4ee29e58..155849e4 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -753,7 +753,7 @@ var Mappings = Module("mappings", {
                                     ({ helpTag: prefix + map.name, __proto__: map }
                                      for (map in self.iterate(args, true))
                                      if (map.hive === mappings.builtin || Set.has(tags, prefix + map.name))),
-                    description: "List all " + mode.name + " mode mappings along with their short descriptions",
+                    description: "List all " + mode.displayName + " mode mappings along with their short descriptions",
                     index: mode.char + "-map",
                     getMode: function (args) mode,
                     options: []