diff --git a/right/src/slave_drivers/uhk_module_driver.c b/right/src/slave_drivers/uhk_module_driver.c
index 2d3d592..a95a531 100644
--- a/right/src/slave_drivers/uhk_module_driver.c
+++ b/right/src/slave_drivers/uhk_module_driver.c
@@ -9,6 +9,17 @@
 #include "key_states.h"
 
 uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT];
+
+uint8_t UhkModuleSlaveDriver_SlotIdToDriverId(uint8_t slotId)
+{
+    return slotId-1;
+}
+
+uint8_t UhkModuleSlaveDriver_DriverIdToSlotId(uint8_t uhkModuleDriverId)
+{
+    return uhkModuleDriverId+1;
+}
+
 static uint8_t keyStatesBuffer[MAX_KEY_COUNT_PER_MODULE];
 static i2c_message_t txMessage;
 
diff --git a/right/src/slave_drivers/uhk_module_driver.h b/right/src/slave_drivers/uhk_module_driver.h
index f158637..e954316 100644
--- a/right/src/slave_drivers/uhk_module_driver.h
+++ b/right/src/slave_drivers/uhk_module_driver.h
@@ -11,8 +11,6 @@
 
     #define UHK_MODULE_MAX_COUNT 3
     #define MAX_PWM_BRIGHTNESS 0x64
-    #define SLOT_ID_TO_UHK_MODULE_DRIVER_ID(slotId) ((slotId)-1)
-    #define UHK_MODULE_DRIVER_ID_TO_SLOT_ID(uhkModuleDriverId) ((uhkModuleDriverId)+1)
 
 // Typedefs:
 
@@ -96,6 +94,9 @@
 
 // Functions:
 
+    uint8_t UhkModuleSlaveDriver_SlotIdToDriverId(uint8_t slotId);
+    uint8_t UhkModuleSlaveDriver_DriverIdToSlotId(uint8_t uhkModuleDriverId);
+
     void UhkModuleSlaveDriver_Init(uint8_t uhkModuleDriverId);
     status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId);
     void UhkModuleSlaveDriver_Disconnect(uint8_t uhkModuleDriverId);
diff --git a/right/src/usb_commands/usb_command_get_module_property.c b/right/src/usb_commands/usb_command_get_module_property.c
index 7a801ca..76947d5 100644
--- a/right/src/usb_commands/usb_command_get_module_property.c
+++ b/right/src/usb_commands/usb_command_get_module_property.c
@@ -15,7 +15,7 @@ void UsbCommand_GetModuleProperty()
     module_property_id_t modulePropertyId = GetUsbRxBufferUint8(2);
     switch (modulePropertyId) {
         case ModulePropertyId_VersionNumbers: {
-            uint8_t moduleDriverId = SLOT_ID_TO_UHK_MODULE_DRIVER_ID(slotId);
+            uint8_t moduleDriverId = UhkModuleSlaveDriver_SlotIdToDriverId(slotId);
             uhk_module_state_t *moduleState = UhkModuleStates + moduleDriverId;
             GenericHidOutBuffer[1] = moduleState->moduleId;
             memcpy(GenericHidOutBuffer + 2, &moduleState->moduleProtocolVersion, sizeof(version_t));
diff --git a/right/src/usb_commands/usb_command_jump_to_module_bootloader.c b/right/src/usb_commands/usb_command_jump_to_module_bootloader.c
index 4cd01dc..5cff7e0 100644
--- a/right/src/usb_commands/usb_command_jump_to_module_bootloader.c
+++ b/right/src/usb_commands/usb_command_jump_to_module_bootloader.c
@@ -12,6 +12,6 @@ void UsbCommand_JumpToModuleBootloader(void)
         return;
     }
 
-    uint8_t uhkModuleDriverId = SLOT_ID_TO_UHK_MODULE_DRIVER_ID(slotId);
+    uint8_t uhkModuleDriverId = UhkModuleSlaveDriver_SlotIdToDriverId(slotId);
     UhkModuleStates[uhkModuleDriverId].phase = UhkModulePhase_JumpToBootloader;
 }