diff --git a/right/src/keymaps.c b/right/src/keymaps.c
index efce9b2..0cf99e6 100644
--- a/right/src/keymaps.c
+++ b/right/src/keymaps.c
@@ -13,7 +13,7 @@ uint8_t AllKeymapsCount;
 uint8_t DefaultKeymapIndex;
 uint8_t CurrentKeymapIndex = 0;
 
-void Keymaps_Switch(uint8_t index)
+void SwitchKeymap(uint8_t index)
 {
     CurrentKeymapIndex = index;
     ValidatedUserConfigBuffer.offset = AllKeymaps[index].offset;
diff --git a/right/src/keymaps.h b/right/src/keymaps.h
index 35e3864..1f03772 100644
--- a/right/src/keymaps.h
+++ b/right/src/keymaps.h
@@ -29,6 +29,6 @@
 
 // Functions:
 
-    void Keymaps_Switch(uint8_t index);
+    void SwitchKeymap(uint8_t index);
 
 #endif
diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c
index bd7e16f..50f18d6 100644
--- a/right/src/usb_protocol_handler.c
+++ b/right/src/usb_protocol_handler.c
@@ -140,11 +140,11 @@ void ApplyConfig(void)
         if (memcmp(oldKeymapAbbreviation, AllKeymaps[i].abbreviation, oldKeymapAbbreviationLen)) {
             continue;
         }
-        Keymaps_Switch(i);
+        SwitchKeymap(i);
         return;
     }
 
-    Keymaps_Switch(DefaultKeymapIndex);
+    SwitchKeymap(DefaultKeymapIndex);
 }
 
 void setLedPwm(void)
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
index b580db3..5e6323c 100644
--- a/right/src/usb_report_updater.c
+++ b/right/src/usb_report_updater.c
@@ -132,7 +132,7 @@ void UpdateActiveUsbReports(void)
                         processMouseAction(action);
                         break;
                     case KeyActionType_SwitchKeymap:
-                        Keymaps_Switch(action.switchKeymap.keymapId);
+                        SwitchKeymap(action.switchKeymap.keymapId);
                         break;
                 }
             }