diff --git a/keycluster/src/init_peripherals.c b/keycluster/src/init_peripherals.c
index 79ec3dd..a0072ae 100644
--- a/keycluster/src/init_peripherals.c
+++ b/keycluster/src/init_peripherals.c
@@ -10,6 +10,7 @@
 #include "slave_protocol_handler.h"
 #include "i2c_watchdog.h"
 #include "main.h"
+#include "module.h"
 
 i2c_slave_config_t slaveConfig;
 i2c_slave_handle_t slaveHandle;
@@ -64,7 +65,7 @@ void initI2c(void)
     PORT_SetPinConfig(I2C_BUS_SCL_PORT, I2C_BUS_SCL_PIN, &pinConfig);
 
     I2C_SlaveGetDefaultConfig(&slaveConfig);
-    slaveConfig.slaveAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE;
+    slaveConfig.slaveAddress = I2C_ADDRESS_MODULE_FIRMWARE;
     I2C_SlaveInit(I2C_BUS_BASEADDR, &slaveConfig);
     I2C_SlaveTransferCreateHandle(I2C_BUS_BASEADDR, &slaveHandle, i2cSlaveCallback, &userData);
     I2C_SlaveTransferNonBlocking(I2C_BUS_BASEADDR, &slaveHandle, kI2C_SlaveAddressMatchEvent);
diff --git a/keycluster/src/module.h b/keycluster/src/module.h
index afbfd28..931fb2e 100644
--- a/keycluster/src/module.h
+++ b/keycluster/src/module.h
@@ -3,6 +3,7 @@
 
 // Macros:
 
+    #define I2C_ADDRESS_MODULE_FIRMWARE I2C_ADDRESS_LEFT_MODULE_FIRMWARE
     #define MODULE_PROTOCOL_VERSION 1
     #define MODULE_ID ModuleId_KeyClusterLeft
     #define MODULE_KEY_COUNT (KEYBOARD_MATRIX_ROWS_NUM * KEYBOARD_MATRIX_COLS_NUM)
diff --git a/left/src/init_peripherals.c b/left/src/init_peripherals.c
index 79ec3dd..a0072ae 100644
--- a/left/src/init_peripherals.c
+++ b/left/src/init_peripherals.c
@@ -10,6 +10,7 @@
 #include "slave_protocol_handler.h"
 #include "i2c_watchdog.h"
 #include "main.h"
+#include "module.h"
 
 i2c_slave_config_t slaveConfig;
 i2c_slave_handle_t slaveHandle;
@@ -64,7 +65,7 @@ void initI2c(void)
     PORT_SetPinConfig(I2C_BUS_SCL_PORT, I2C_BUS_SCL_PIN, &pinConfig);
 
     I2C_SlaveGetDefaultConfig(&slaveConfig);
-    slaveConfig.slaveAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE;
+    slaveConfig.slaveAddress = I2C_ADDRESS_MODULE_FIRMWARE;
     I2C_SlaveInit(I2C_BUS_BASEADDR, &slaveConfig);
     I2C_SlaveTransferCreateHandle(I2C_BUS_BASEADDR, &slaveHandle, i2cSlaveCallback, &userData);
     I2C_SlaveTransferNonBlocking(I2C_BUS_BASEADDR, &slaveHandle, kI2C_SlaveAddressMatchEvent);
diff --git a/left/src/module.h b/left/src/module.h
index 79cba53..822318d 100644
--- a/left/src/module.h
+++ b/left/src/module.h
@@ -3,6 +3,7 @@
 
 // Macros:
 
+    #define I2C_ADDRESS_MODULE_FIRMWARE I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE
     #define MODULE_PROTOCOL_VERSION 1
     #define MODULE_ID ModuleId_LeftKeyboardHalf
     #define MODULE_KEY_COUNT (KEYBOARD_MATRIX_ROWS_NUM * KEYBOARD_MATRIX_COLS_NUM)