diff --git a/popup.html b/popup.html
index 20fe5323..f4a380e7 100644
--- a/popup.html
+++ b/popup.html
@@ -271,8 +271,8 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
   </div>
 </script>
 
-<!-- Change keymap action. -->
-<script id="key-editor-content__source--changeKeymap" type="text/x-handlebars-template">
+<!-- Switch keymap action. -->
+<script id="key-editor-content__source--switchKeymap" type="text/x-handlebars-template">
   <div class="popover-content" style="margin-bottom:2px">
     <div style="margin-bottom:0px; margin-top:2px">
       <b style="">Keymap:</b>
diff --git a/popup__iframe.html b/popup__iframe.html
index e694bacb..236ad46e 100644
--- a/popup__iframe.html
+++ b/popup__iframe.html
@@ -255,8 +255,8 @@
   </div>
 </script>
 
-<!-- Change keymap action. -->
-<script id="key-editor-content__source--changeKeymap" type="text/x-handlebars-template">
+<!-- Switch keymap action. -->
+<script id="key-editor-content__source--switchKeymap" type="text/x-handlebars-template">
   <div class="popover-content" style="margin-bottom:2px">
     <div style="margin-bottom:0px; margin-top:2px">
       <b style="">Keymap:</b>
diff --git a/script.js b/script.js
index 7971d0b8..bed22532 100644
--- a/script.js
+++ b/script.js
@@ -194,7 +194,7 @@ $(function() {
         },
       ]
     },
-    changeKeymap: {
+    switchKeymap: {
       layouts: [
         {
           value: 'Select keymap',
@@ -247,8 +247,8 @@ $(function() {
       {
         type: 'default',
         icon: 'fa-keyboard-o',
-        title: 'Change keymap',
-        content: 'changeKeymap'
+        title: 'Switch keymap',
+        content: 'switchKeymap'
       },
       {
         type: 'default',