diff --git a/right/src/bridge_protocol_scheduler.c b/right/src/bridge_protocol_scheduler.c
index bd7e459..09b1a12 100644
--- a/right/src/bridge_protocol_scheduler.c
+++ b/right/src/bridge_protocol_scheduler.c
@@ -10,7 +10,7 @@
 
 uint8_t currentBridgeSlaveId = 0;
 
-bridge_slave_t bridgeSlaves[] = {
+uhk_slave_t bridgeSlaves[] = {
     { .slaveHandler = BridgeSlaveUhkModuleHandler, .moduleId = 0 },
     { .slaveHandler = BridgeSlaveLedDriverHandler, .moduleId = 0 },
     { .slaveHandler = BridgeSlaveLedDriverHandler, .moduleId = 1 },
@@ -21,13 +21,13 @@ static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle,
     if (TestStates.disableI2c) {
         return;
     }
-    bridge_slave_t *bridgeSlave = bridgeSlaves + currentBridgeSlaveId;
+    uhk_slave_t *bridgeSlave = bridgeSlaves + currentBridgeSlaveId;
 
     bool isFinished = bridgeSlave->slaveHandler(bridgeSlave->moduleId);
     if (isFinished) {
         currentBridgeSlaveId++;
 
-        if (currentBridgeSlaveId >= (sizeof(bridgeSlaves) / sizeof(bridge_slave_t))) {
+        if (currentBridgeSlaveId >= (sizeof(bridgeSlaves) / sizeof(uhk_slave_t))) {
             currentBridgeSlaveId = 0;
         }
     }
diff --git a/right/src/bridge_protocol_scheduler.h b/right/src/bridge_protocol_scheduler.h
index 79d8cb4..fc4849c 100644
--- a/right/src/bridge_protocol_scheduler.h
+++ b/right/src/bridge_protocol_scheduler.h
@@ -11,7 +11,7 @@
         BridgeSlaveType_LedDriver,
         BridgeSlaveType_UhkModule,
         BridgeSlaveType_Touchpad
-    } bridge_slave_type_t;
+    } uhk_slave_type_t;
 
     typedef bool (slave_handler_t)(uint8_t);
 
@@ -19,7 +19,7 @@
         uint8_t moduleId;  // This is a unique, per-module ID.
         slave_handler_t *slaveHandler;
         bool isConnected;
-    } bridge_slave_t;
+    } uhk_slave_t;
 
 // Functions: