diff --git a/right/src/slave_drivers/slave_driver_led_driver.c b/right/src/slave_drivers/slave_driver_led_driver.c
index 87262c0..50e1605 100644
--- a/right/src/slave_drivers/slave_driver_led_driver.c
+++ b/right/src/slave_drivers/slave_driver_led_driver.c
@@ -54,7 +54,7 @@ uint8_t setFunctionFrameBuffer[] = {LED_DRIVER_REGISTER_FRAME, LED_DRIVER_FRAME_
 uint8_t setShutdownModeNormalBuffer[] = {LED_DRIVER_REGISTER_SHUTDOWN, SHUTDOWN_MODE_NORMAL};
 uint8_t setFrame1Buffer[] = {LED_DRIVER_REGISTER_FRAME, LED_DRIVER_FRAME_1};
 
-void BridgeSlaveLedDriverHandler(uint8_t ledDriverId) {
+void UhkSlaveLedDriverHandler(uint8_t ledDriverId) {
     uint8_t *ledDriverState = ledDriverStates + ledDriverId;
     uint8_t ledDriverAddress = ledDriverId ? I2C_ADDRESS_LED_DRIVER_LEFT : I2C_ADDRESS_LED_DRIVER_RIGHT;
     uint8_t *ledControlBuffer = ledDriverId ? ledControlBufferLeft : ledControlBufferRight;
diff --git a/right/src/slave_drivers/slave_driver_led_driver.h b/right/src/slave_drivers/slave_driver_led_driver.h
index 05a2b67..0121b5e 100644
--- a/right/src/slave_drivers/slave_driver_led_driver.h
+++ b/right/src/slave_drivers/slave_driver_led_driver.h
@@ -17,7 +17,7 @@
 
 // Functions:
 
-    extern void BridgeSlaveLedDriverHandler(uint8_t ledDriverId);
+    extern void UhkSlaveLedDriverHandler(uint8_t ledDriverId);
     extern void SetLeds(uint8_t ledBrightness);
 
 #endif
diff --git a/right/src/slave_drivers/slave_driver_uhk_module.c b/right/src/slave_drivers/slave_driver_uhk_module.c
index a5be85e..02870da 100644
--- a/right/src/slave_drivers/slave_driver_uhk_module.c
+++ b/right/src/slave_drivers/slave_driver_uhk_module.c
@@ -20,7 +20,7 @@ void InitUhkModules()
     }
 }
 
-void BridgeSlaveUhkModuleHandler(uint8_t uhkModuleId)
+void UhkSlaveUhkModuleHandler(uint8_t uhkModuleId)
 {
     uhk_module_state_t *uhkModuleInternalState = UhkModuleStates + uhkModuleId;
     //uhk_module_state_t *uhkModuleExternalState = uhkModuleExternalStates + uhkModuleId;
diff --git a/right/src/slave_drivers/slave_driver_uhk_module.h b/right/src/slave_drivers/slave_driver_uhk_module.h
index 22d274a..c623525 100644
--- a/right/src/slave_drivers/slave_driver_uhk_module.h
+++ b/right/src/slave_drivers/slave_driver_uhk_module.h
@@ -33,6 +33,6 @@
 // Functions:
 
     extern void InitUhkModules();
-    extern void BridgeSlaveUhkModuleHandler(uint8_t uhkModuleId);
+    extern void UhkSlaveUhkModuleHandler(uint8_t uhkModuleId);
 
 #endif
diff --git a/right/src/slave_scheduler.c b/right/src/slave_scheduler.c
index 1c66303..c487e98 100644
--- a/right/src/slave_scheduler.c
+++ b/right/src/slave_scheduler.c
@@ -11,9 +11,9 @@
 uint8_t currentBridgeSlaveId = 0;
 
 uhk_slave_t bridgeSlaves[] = {
-    { .slaveHandler = BridgeSlaveUhkModuleHandler, .moduleId = 0 },
-    { .slaveHandler = BridgeSlaveLedDriverHandler, .moduleId = 0 },
-    { .slaveHandler = BridgeSlaveLedDriverHandler, .moduleId = 1 },
+    { .slaveHandler = UhkSlaveUhkModuleHandler, .moduleId = 0 },
+    { .slaveHandler = UhkSlaveLedDriverHandler, .moduleId = 0 },
+    { .slaveHandler = UhkSlaveLedDriverHandler, .moduleId = 1 },
 };
 
 static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData)