diff --git a/right/src/usb_commands/usb_command_get_keyboard_state.c b/right/src/usb_commands/usb_command_get_device_state.c
similarity index 90%
rename from right/src/usb_commands/usb_command_get_keyboard_state.c
rename to right/src/usb_commands/usb_command_get_device_state.c
index 4a55ccc..1fc2171 100644
--- a/right/src/usb_commands/usb_command_get_keyboard_state.c
+++ b/right/src/usb_commands/usb_command_get_device_state.c
@@ -1,5 +1,5 @@
 #include "fsl_common.h"
-#include "usb_commands/usb_command_get_keyboard_state.h"
+#include "usb_commands/usb_command_get_device_state.h"
 #include "usb_protocol_handler.h"
 #include "eeprom.h"
 #include "peripherals/merge_sensor.h"
diff --git a/right/src/usb_commands/usb_command_get_keyboard_state.h b/right/src/usb_commands/usb_command_get_device_state.h
similarity index 100%
rename from right/src/usb_commands/usb_command_get_keyboard_state.h
rename to right/src/usb_commands/usb_command_get_device_state.h
diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c
index c1851fb..9c7ff45 100644
--- a/right/src/usb_protocol_handler.c
+++ b/right/src/usb_protocol_handler.c
@@ -9,7 +9,7 @@
 #include "usb_commands/usb_command_get_adc_value.h"
 #include "usb_commands/usb_command_launch_eeprom_transfer.h"
 #include "usb_commands/usb_command_read_config.h"
-#include "usb_commands/usb_command_get_keyboard_state.h"
+#include "usb_commands/usb_command_get_device_state.h"
 #include "usb_commands/usb_command_get_debug_buffer.h"
 #include "usb_commands/usb_command_jump_to_module_bootloader.h"
 #include "usb_commands/usb_command_send_kboot_command_to_module.h"