diff --git a/src/components/KeyboardConfiguration.vue b/src/components/KeyboardConfiguration.vue
index ccd4fae0abaa0d5f20f9da314c07b3238d90a21b..a719f797f6b96a9e09962ebbbd5ce55eeedbe058 100644
--- a/src/components/KeyboardConfiguration.vue
+++ b/src/components/KeyboardConfiguration.vue
@@ -77,11 +77,11 @@ export default {
     displayUTF8,
   },
   methods: {
-    ...mapMutations(["updateKey"]),
+    ...mapMutations(["updateKeyboardKey"]),
     replace() {
       if (!this.selectedKey || !this.selectedChar) return;
       // Update the keyboard
-      this.updateKey({
+      this.updateKeyboardKey({
         index: this.keyboardIndex,
         ...this.selectedKey,
         character: displayUTF8(this.selectedChar.code),
@@ -91,7 +91,7 @@ export default {
       this.picker = false;
     },
     updateKeyBinding() {
-      this.updateKey({
+      this.updateKeyboardKey({
         index: this.keyboardIndex,
         ...this.selectedKey,
         keyboard_code: this.keyBinding ? this.keyBinding.charCodeAt() : null,
diff --git a/src/components/KeyboardManager.vue b/src/components/KeyboardManager.vue
index 29774feaed376abfc0dc3ec4e27a2ed04c90980a..74eeec5950747dbe65cfff8a33e5f6e693636a5a 100644
--- a/src/components/KeyboardManager.vue
+++ b/src/components/KeyboardManager.vue
@@ -5,7 +5,7 @@
         ⏴
       </a>
       <input type="text" v-model="keyboardName" />
-      <button type="button" v-on:click="updateKeyboardName">Save</button>
+      <button type="button" v-on:click="changeKeyboardName">Save</button>
       <KeyboardConfiguration :keyboard-index="editedKeyboard" />
     </div>
     <div v-else-if="selectedKeyboard !== null">
@@ -104,18 +104,18 @@ export default {
     ...mapState(["keyboards"]),
   },
   methods: {
-    ...mapMutations(["add", "delete", "updateName"]),
-    updateKeyboardName() {
-      this.updateName({
+    ...mapMutations(["addKeyboard", "removeKeyboard", "updateKeyboardName"]),
+    changeKeyboardName() {
+      this.updateKeyboardName({
         index: this.editedKeyboard,
         name: this.keyboardName,
       });
     },
     createKeyboard() {
-      this.add();
+      this.addKeyboard();
     },
     deleteKeyboard() {
-      this.delete(this.keyboardToDelete);
+      this.removeKeyboard(this.keyboardToDelete);
       this.keyboardToDelete = null;
       this.deleteModal = false;
     },
diff --git a/src/store/index.js b/src/store/index.js
index be0b54d8d7471f3052ae863c0bae166ad581f557..0ea2d4bb4bdbfa6a260e7edc29371b3984c84b36 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -44,17 +44,17 @@ export default new Vuex.Store({
     setSelectedScript(state, { name, page }) {
       state.selectedScript = { name, page };
     },
-    add(state) {
+    addKeyboard(state) {
       state.keyboards = [...state.keyboards, { ...NEW_KEYBOARD }];
     },
-    delete(state, index) {
+    removeKeyboard(state, index) {
       state.keyboards.splice(index, 1);
     },
-    updateName(state, { index, name }) {
+    updateKeyboardName(state, { index, name }) {
       if (!state.keyboards[index]) return;
       state.keyboards[index].name = name;
     },
-    updateKey(state, { index, ...newKey }) {
+    updateKeyboardKey(state, { index, ...newKey }) {
       // Copy the keyboard if the index is correct to avoid modifying it directly in the state
       const keyboard = state.keyboards[index] && { ...state.keyboards[index] };
       if (!keyboard) return;