diff --git a/right/src/slave_scheduler.c b/right/src/slave_scheduler.c
index 58a9c2e..439c9a8 100644
--- a/right/src/slave_scheduler.c
+++ b/right/src/slave_scheduler.c
@@ -16,9 +16,9 @@ slave_driver_initializer_t slaveDriverInitializers[] = {
 };
 
 uhk_slave_t slaves[] = {
-    { .updater = UhkModuleSlaveDriver_Update, .moduleId = 0 },
-    { .updater = LedSlaveDriver_Update,       .moduleId = 0 },
-    { .updater = LedSlaveDriver_Update,       .moduleId = 1 },
+    { .updater = UhkModuleSlaveDriver_Update, .perDriverId = 0 },
+    { .updater = LedSlaveDriver_Update,       .perDriverId = 0 },
+    { .updater = LedSlaveDriver_Update,       .perDriverId = 1 },
 };
 
 static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData)
@@ -28,7 +28,7 @@ static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle,
     }
     uhk_slave_t *bridgeSlave = slaves + currentSlaveId;
 
-    bridgeSlave->updater(bridgeSlave->moduleId);
+    bridgeSlave->updater(bridgeSlave->perDriverId);
     currentSlaveId++;
 
     if (currentSlaveId >= (sizeof(slaves) / sizeof(uhk_slave_t))) {
@@ -49,5 +49,5 @@ void InitSlaveScheduler()
     I2C_MasterTransferCreateHandle(I2C_MAIN_BUS_BASEADDR, &I2cMasterHandle, bridgeProtocolCallback, NULL);
 
     // Kickstart the scheduler by triggering the first callback.
-    slaves[0].updater(slaves[0].moduleId);
+    slaves[0].updater(slaves[0].perDriverId);
 }
diff --git a/right/src/slave_scheduler.h b/right/src/slave_scheduler.h
index 9a87d7d..c48967a 100644
--- a/right/src/slave_scheduler.h
+++ b/right/src/slave_scheduler.h
@@ -17,7 +17,7 @@
     typedef void (*slave_driver_initializer_t)();
 
     typedef struct {
-        uint8_t moduleId;  // This is a unique, per-module ID.
+        uint8_t perDriverId;  // Identifies the slave instance on a per-driver basis
         slave_updater_t *updater;
         bool isConnected;
     } uhk_slave_t;