diff --git a/keycluster/Makefile b/keycluster/Makefile
index 6a6dda7..7a10933 100644
--- a/keycluster/Makefile
+++ b/keycluster/Makefile
@@ -29,7 +29,7 @@ CPU = -mcpu=cortex-m0plus
 FPU = -mfloat-abi=soft
 
 # Command for flashing the key cluster module.
-FLASH_CMD = node ../lib/agent/packages/usb/update-module-firmware.js keyCluster $(PROJECT_OBJ:.axf=.bin)
+FLASH_CMD = node ../lib/agent/packages/usb/update-module-firmware.js leftModule $(PROJECT_OBJ:.axf=.bin)
 
 # Path to the JLink script used for the key cluster module.
 JLINK_SCRIPT = ../scripts/flash-keycluster.jlink
diff --git a/shared/i2c_addresses.h b/shared/i2c_addresses.h
index fa9d9cc..0ba137e 100644
--- a/shared/i2c_addresses.h
+++ b/shared/i2c_addresses.h
@@ -29,11 +29,11 @@
     #define I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE   0x08
     #define I2C_ADDRESS_LEFT_KEYBOARD_HALF_BOOTLOADER 0x10
     #define I2C_ADDRESS_RIGHT_IQS5XX_FIRMWARE         0x15 // Touchpad
-    #define I2C_ADDRESS_LEFT_ADDON_FIRMWARE           0x18
-    #define I2C_ADDRESS_LEFT_ADDON_BOOTLOADER         0x20
+    #define I2C_ADDRESS_LEFT_MODULE_FIRMWARE          0x18
+    #define I2C_ADDRESS_LEFT_MODULE_BOOTLOADER        0x20
     #define I2C_ADDRESS_LEFT_IQS5XX_FIRMWARE          0x25 // Touchpad
-    #define I2C_ADDRESS_RIGHT_ADDON_FIRMWARE          0x28
-    #define I2C_ADDRESS_RIGHT_ADDON_BOOTLOADER        0x30
+    #define I2C_ADDRESS_RIGHT_MODULE_FIRMWARE         0x28
+    #define I2C_ADDRESS_RIGHT_MODULE_BOOTLOADER       0x30
     #define I2C_ADDRESS_RIGHT_IQS5XX_BOOTLOADER       0x55 // Touchpad
     #define I2C_ADDRESS_LEFT_IQS5XX_BOOTLOADER        0x65 // Touchpad
     #define I2C_ADDRESS_IS31FL3731_LEFT               0x74 // LED driver