diff --git a/right/src/slave_drivers/uhk_module_driver.h b/right/src/slave_drivers/uhk_module_driver.h
index d4b98a7..ff3160e 100644
--- a/right/src/slave_drivers/uhk_module_driver.h
+++ b/right/src/slave_drivers/uhk_module_driver.h
@@ -15,9 +15,9 @@
 // Typedefs:
 
     typedef enum {
-        UhkModuleId_LeftKeyboardHalf,
-        UhkModuleId_LeftAddon,
-        UhkModuleId_RightAddon,
+        UhkModuleDriverId_LeftKeyboardHalf,
+        UhkModuleDriverId_LeftAddon,
+        UhkModuleDriverId_RightAddon,
     } uhk_module_id_t;
 
     typedef enum {
diff --git a/right/src/slave_scheduler.c b/right/src/slave_scheduler.c
index a038a84..1eb47ed 100644
--- a/right/src/slave_scheduler.c
+++ b/right/src/slave_scheduler.c
@@ -12,11 +12,11 @@ uint8_t currentSlaveId;
 uint32_t BridgeCounter;
 
 uhk_slave_t Slaves[] = {
-    { .init = UhkModuleSlaveDriver_Init, .update = UhkModuleSlaveDriver_Update, .perDriverId = UhkModuleId_LeftKeyboardHalf },
-    { .init = UhkModuleSlaveDriver_Init, .update = UhkModuleSlaveDriver_Update, .perDriverId = UhkModuleId_LeftAddon        },
-    { .init = UhkModuleSlaveDriver_Init, .update = UhkModuleSlaveDriver_Update, .perDriverId = UhkModuleId_RightAddon       },
-    { .init = LedSlaveDriver_Init,       .update = LedSlaveDriver_Update,       .perDriverId = LedDriverId_Right            },
-    { .init = LedSlaveDriver_Init,       .update = LedSlaveDriver_Update,       .perDriverId = LedDriverId_Left             },
+    { .init = UhkModuleSlaveDriver_Init, .update = UhkModuleSlaveDriver_Update, .perDriverId = UhkModuleDriverId_LeftKeyboardHalf },
+    { .init = UhkModuleSlaveDriver_Init, .update = UhkModuleSlaveDriver_Update, .perDriverId = UhkModuleDriverId_LeftAddon        },
+    { .init = UhkModuleSlaveDriver_Init, .update = UhkModuleSlaveDriver_Update, .perDriverId = UhkModuleDriverId_RightAddon       },
+    { .init = LedSlaveDriver_Init,       .update = LedSlaveDriver_Update,       .perDriverId = LedDriverId_Right                  },
+    { .init = LedSlaveDriver_Init,       .update = LedSlaveDriver_Update,       .perDriverId = LedDriverId_Left                   },
 };
 
 static void masterCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t previousStatus, void *userData)