diff --git a/src/console/console.js b/src/console/console.js
index a171ecc..61c5e24 100644
--- a/src/console/console.js
+++ b/src/console/console.js
@@ -8,20 +8,20 @@ var prevValue = "";
 
 const blurMessage = () => {
   return {
-    type: 'vimvixen.commandline.blur'
+    type: 'vimvixen.command.blur'
   };
 };
 
 const keydownMessage = (input) => {
   return {
-    type: 'vimvixen.commandline.enter',
+    type: 'vimvixen.command.enter',
     value: input.value
   };
 };
 
 const keyupMessage = (input) => {
   return {
-    type: 'vimvixen.commandline.change',
+    type: 'vimvixen.command.change',
     value: input.value
   };
 };
diff --git a/src/content/index.js b/src/content/index.js
index 710fbda..731d6a5 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -77,16 +77,16 @@ window.addEventListener("keypress", (e) => {
 
 messages.receive(window, (message) => {
   switch (message.type) {
-  case 'vimvixen.commandline.blur':
+  case 'vimvixen.command.blur':
     vvConsole.hide();
     break;
-  case 'vimvixen.commandline.enter':
+  case 'vimvixen.command.enter':
     browser.runtime.sendMessage({
       type: 'event.cmd.enter',
       text: message.value
     });
     break;
-  case 'vimvixen.commandline.change':
+  case 'vimvixen.command.change':
     browser.runtime.sendMessage({
       type: 'event.cmd.suggest',
       text: message.value