diff --git a/right/src/slave_drivers/slave_driver_uhk_module.c b/right/src/slave_drivers/slave_driver_uhk_module.c
index 02870da..f8e0fc9 100644
--- a/right/src/slave_drivers/slave_driver_uhk_module.c
+++ b/right/src/slave_drivers/slave_driver_uhk_module.c
@@ -11,7 +11,7 @@ uhk_module_field_t currentUhkModuleField = UhkModuleField_SendKeystatesRequestCo
 uhk_module_state_t uhkModuleExternalStates[UHK_MODULE_MAX_COUNT];
 uint8_t txBuffer[2];
 
-void InitUhkModules()
+void UhkModuleSlaveDriver_Init()
 {
     for (uint8_t moduleId=0; moduleId<UHK_MODULE_MAX_COUNT; moduleId++) {
         uhk_module_state_t* uhkModuleState = UhkModuleStates + moduleId;
@@ -20,7 +20,7 @@ void InitUhkModules()
     }
 }
 
-void UhkSlaveUhkModuleHandler(uint8_t uhkModuleId)
+void UhkModuleSlaveDriver_Update(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 c623525..dbcbb22 100644
--- a/right/src/slave_drivers/slave_driver_uhk_module.h
+++ b/right/src/slave_drivers/slave_driver_uhk_module.h
@@ -32,7 +32,7 @@
 
 // Functions:
 
-    extern void InitUhkModules();
-    extern void UhkSlaveUhkModuleHandler(uint8_t uhkModuleId);
+    extern void UhkModuleSlaveDriver_Init();
+    extern void UhkModuleSlaveDriver_Update(uint8_t uhkModuleId);
 
 #endif
diff --git a/right/src/slave_scheduler.c b/right/src/slave_scheduler.c
index 42c5a54..cd53111 100644
--- a/right/src/slave_scheduler.c
+++ b/right/src/slave_scheduler.c
@@ -11,12 +11,12 @@
 uint8_t currentBridgeSlaveId = 0;
 
 slave_driver_initializer_t slaveDriverInitializers[] = {
-    InitUhkModules,
+    UhkModuleSlaveDriver_Init,
     LedSlaveDriver_Init,
 };
 
 uhk_slave_t slaves[] = {
-    { .slaveHandler = UhkSlaveUhkModuleHandler, .moduleId = 0 },
+    { .slaveHandler = UhkModuleSlaveDriver_Update, .moduleId = 0 },
     { .slaveHandler = LedSlaveDriver_Update, .moduleId = 0 },
     { .slaveHandler = LedSlaveDriver_Update, .moduleId = 1 },
 };