diff --git a/mouse_movement.cpp b/MouseWrapper.cpp
similarity index 98%
rename from mouse_movement.cpp
rename to MouseWrapper.cpp
index a4c9158a..58d311ce 100644
--- a/mouse_movement.cpp
+++ b/MouseWrapper.cpp
@@ -2,7 +2,7 @@
 // Mouse-related methods
 //
 //
-#include "mouse_movement.h"
+#include "MouseWrapper.h"
 
 
 // Warping
diff --git a/mouse_movement.h b/MouseWrapper.h
similarity index 100%
rename from mouse_movement.h
rename to MouseWrapper.h
diff --git a/key_events.h b/key_events.h
index 05f6628d..e105511b 100644
--- a/key_events.h
+++ b/key_events.h
@@ -3,7 +3,7 @@
 
 #include "key_defs.h"
 #include "matrix_state.h"
-#include "mouse_movement.h"
+#include "MouseWrapper.h"
 #include "led_control.h"
 #include "storage.h"