diff --git a/right/src/config_parser/parse_keymap.c b/right/src/config_parser/parse_keymap.c
index 7bea9eb..b61516f 100644
--- a/right/src/config_parser/parse_keymap.c
+++ b/right/src/config_parser/parse_keymap.c
@@ -1,6 +1,6 @@
 #include "config_parser/parse_keymap.h"
 #include "key_action.h"
-#include "current_keymap.h"
+#include "keymaps.h"
 #include "led_display.h"
 
 static parser_error_t parseNoneAction(key_action_t *keyAction, config_buffer_t *buffer) {
diff --git a/right/src/current_keymap.c b/right/src/keymaps.c
similarity index 100%
rename from right/src/current_keymap.c
rename to right/src/keymaps.c
diff --git a/right/src/current_keymap.h b/right/src/keymaps.h
similarity index 72%
rename from right/src/current_keymap.h
rename to right/src/keymaps.h
index 513a682..3e644d6 100644
--- a/right/src/current_keymap.h
+++ b/right/src/keymaps.h
@@ -1,5 +1,5 @@
-#ifndef __CURRENT_KEYMAP_H__
-#define __CURRENT_KEYMAP_H__
+#ifndef __KEYMAPS_H__
+#define __KEYMAPS_H__
 
 // Includes:
 
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
index 00d7651..19a940f 100644
--- a/right/src/usb_report_updater.c
+++ b/right/src/usb_report_updater.c
@@ -3,7 +3,7 @@
 #include "led_display.h"
 #include "layer.h"
 #include "usb_interfaces/usb_interface_mouse.h"
-#include "current_keymap.h"
+#include "keymaps.h"
 #include "test_states.h"
 #include "peripherals/test_led.h"
 #include "slave_drivers/is31fl3731_driver.h"