diff --git a/right/src/slave_drivers/uhk_module_driver.c b/right/src/slave_drivers/uhk_module_driver.c
index cfee779..45809e3 100644
--- a/right/src/slave_drivers/uhk_module_driver.c
+++ b/right/src/slave_drivers/uhk_module_driver.c
@@ -8,8 +8,8 @@
 #include "bool_array_converter.h"
 #include "crc16.h"
 
-uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT];
-static uhk_module_state_t uhkModuleTargetStates[UHK_MODULE_MAX_COUNT];
+uhk_module_vars_t UhkModuleVars[UHK_MODULE_MAX_COUNT];
+static uhk_module_vars_t uhkModuleTargetStates[UHK_MODULE_MAX_COUNT];
 static uhk_module_phase_t uhkModulePhases[UHK_MODULE_MAX_COUNT];
 
 static i2c_message_t rxMessage;
@@ -25,8 +25,8 @@ static status_t rx(void) {
 
 void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId)
 {
-    uhk_module_state_t* uhkModuleSourceState = UhkModuleStates + uhkModuleId;
-    uhk_module_state_t* uhkModuleTargetState = uhkModuleTargetStates + uhkModuleId;
+    uhk_module_vars_t* uhkModuleSourceState = UhkModuleVars + uhkModuleId;
+    uhk_module_vars_t* uhkModuleTargetState = uhkModuleTargetStates + uhkModuleId;
 
     uhkModuleSourceState->isTestLedOn = true;
     uhkModuleTargetState->isTestLedOn = false;
@@ -41,8 +41,8 @@ void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId)
 status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId)
 {
     status_t status = kStatus_Uhk_IdleSlave;
-    uhk_module_state_t *uhkModuleSourceState = UhkModuleStates + uhkModuleId;
-    uhk_module_state_t *uhkModuleTargetState = uhkModuleTargetStates + uhkModuleId;
+    uhk_module_vars_t *uhkModuleSourceState = UhkModuleVars + uhkModuleId;
+    uhk_module_vars_t *uhkModuleTargetState = uhkModuleTargetStates + uhkModuleId;
     uhk_module_phase_t *uhkModulePhase = uhkModulePhases + uhkModuleId;
 
     switch (*uhkModulePhase) {
diff --git a/right/src/slave_drivers/uhk_module_driver.h b/right/src/slave_drivers/uhk_module_driver.h
index d09aafa..be4c33e 100644
--- a/right/src/slave_drivers/uhk_module_driver.h
+++ b/right/src/slave_drivers/uhk_module_driver.h
@@ -31,11 +31,11 @@
     typedef struct {
         uint8_t ledPwmBrightness;
         bool isTestLedOn;
-    } uhk_module_state_t;
+    } uhk_module_vars_t;
 
 // Variables:
 
-    extern uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT];
+    extern uhk_module_vars_t UhkModuleVars[UHK_MODULE_MAX_COUNT];
 
 // Functions:
 
diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c
index dee5d95..55ea7a5 100644
--- a/right/src/usb_protocol_handler.c
+++ b/right/src/usb_protocol_handler.c
@@ -80,7 +80,7 @@ void setTestLed(void)
 {
     uint8_t ledState = GenericHidInBuffer[1];
     TEST_LED_SET(ledState);
-    UhkModuleStates[0].isTestLedOn = ledState;
+    UhkModuleVars[0].isTestLedOn = ledState;
 }
 
 void readMergeSensor(void)
@@ -134,7 +134,7 @@ void setLedPwm(void)
 {
     uint8_t brightnessPercent = GenericHidInBuffer[1];
     LedPwm_SetBrightness(brightnessPercent);
-    UhkModuleStates[0].ledPwmBrightness = brightnessPercent;
+    UhkModuleVars[0].ledPwmBrightness = brightnessPercent;
 }
 
 void getAdcValue(void)