diff --git a/key_events.h b/key_events.h
index 14977797..fd01ab6a 100644
--- a/key_events.h
+++ b/key_events.h
@@ -2,7 +2,7 @@
 #include <Arduino.h>
 
 #include "key_defs.h"
-#include "matrix_state.h"
+#include "keyswitch_state.h"
 #include "MouseWrapper.h"
 #include "LEDControl.h"
 #include "Storage.h"
diff --git a/matrix_state.cpp b/keyswitch_state.cpp
similarity index 96%
rename from matrix_state.cpp
rename to keyswitch_state.cpp
index 2457be44..9f0ec330 100644
--- a/matrix_state.cpp
+++ b/keyswitch_state.cpp
@@ -1,4 +1,4 @@
-#include "matrix_state.h"
+#include "keyswitch_state.h"
 // switch debouncing and status
 
 
diff --git a/matrix_state.h b/keyswitch_state.h
similarity index 100%
rename from matrix_state.h
rename to keyswitch_state.h