diff --git a/right/src/bridge_protocol_scheduler.c b/right/src/bridge_protocol_scheduler.c
index ed5fb77..bd7e459 100644
--- a/right/src/bridge_protocol_scheduler.c
+++ b/right/src/bridge_protocol_scheduler.c
@@ -2,8 +2,8 @@
 #include "bridge_protocol_scheduler.h"
 #include "slot.h"
 #include "main.h"
-#include "slave_drivers/bridge_slave_led_driver.h"
-#include "slave_drivers/bridge_slave_uhk_module.h"
+#include "slave_drivers/slave_driver_led_driver.h"
+#include "slave_drivers/slave_driver_uhk_module.h"
 #include "i2c.h"
 #include "i2c_addresses.h"
 #include "test_states.h"
diff --git a/right/src/slave_drivers/bridge_slave_led_driver.c b/right/src/slave_drivers/slave_driver_led_driver.c
similarity index 98%
rename from right/src/slave_drivers/bridge_slave_led_driver.c
rename to right/src/slave_drivers/slave_driver_led_driver.c
index 734bf5b..0c0ad85 100644
--- a/right/src/slave_drivers/bridge_slave_led_driver.c
+++ b/right/src/slave_drivers/slave_driver_led_driver.c
@@ -1,4 +1,4 @@
-#include "bridge_slave_led_driver.h"
+#include "slave_drivers/slave_driver_led_driver.h"
 #include "led_driver.h"
 
 #define BUFFER_SIZE (LED_DRIVER_LED_COUNT + 1)
diff --git a/right/src/slave_drivers/bridge_slave_led_driver.h b/right/src/slave_drivers/slave_driver_led_driver.h
similarity index 100%
rename from right/src/slave_drivers/bridge_slave_led_driver.h
rename to right/src/slave_drivers/slave_driver_led_driver.h
diff --git a/right/src/slave_drivers/bridge_slave_uhk_module.c b/right/src/slave_drivers/slave_driver_uhk_module.c
similarity index 98%
rename from right/src/slave_drivers/bridge_slave_uhk_module.c
rename to right/src/slave_drivers/slave_driver_uhk_module.c
index 93333e8..eade2d7 100644
--- a/right/src/slave_drivers/bridge_slave_uhk_module.c
+++ b/right/src/slave_drivers/slave_driver_uhk_module.c
@@ -1,6 +1,6 @@
 #include "i2c_addresses.h"
 #include "i2c.h"
-#include "bridge_slave_uhk_module.h"
+#include "slave_drivers/slave_driver_uhk_module.h"
 #include "bridge_protocol.h"
 #include "main.h"
 #include "peripherals/test_led.h"
diff --git a/right/src/slave_drivers/bridge_slave_uhk_module.h b/right/src/slave_drivers/slave_driver_uhk_module.h
similarity index 100%
rename from right/src/slave_drivers/bridge_slave_uhk_module.h
rename to right/src/slave_drivers/slave_driver_uhk_module.h
diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c
index fb60c8a..63aca2c 100644
--- a/right/src/usb_protocol_handler.c
+++ b/right/src/usb_protocol_handler.c
@@ -8,7 +8,7 @@
 #include "config_buffer.h"
 #include "led_pwm.h"
 #include "bridge_protocol_scheduler.h"
-#include "slave_drivers/bridge_slave_uhk_module.h"
+#include "slave_drivers/slave_driver_uhk_module.h"
 #include "wormhole.h"
 
 void setError(uint8_t error);
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
index 3eec367..16b5e0b 100644
--- a/right/src/usb_report_updater.c
+++ b/right/src/usb_report_updater.c
@@ -6,8 +6,8 @@
 #include "current_keymap.h"
 #include "test_states.h"
 #include "peripherals/test_led.h"
-#include "slave_drivers/bridge_slave_led_driver.h"
-#include "slave_drivers/bridge_slave_uhk_module.h"
+#include "slave_drivers/slave_driver_led_driver.h"
+#include "slave_drivers/slave_driver_uhk_module.h"
 #include "led_pwm.h"
 
 static uint8_t activeLayer = LAYER_ID_BASE;