diff --git a/left/src/init_peripherals.c b/left/src/init_peripherals.c
index 7ca20c9..6afdff9 100644
--- a/left/src/init_peripherals.c
+++ b/left/src/init_peripherals.c
@@ -18,20 +18,20 @@ static void i2cSlaveCallback(I2C_Type *base, i2c_slave_transfer_t *xfer, void *u
 {
     if (prevEvent != kI2C_SlaveReceiveEvent && xfer->event == kI2C_SlaveReceiveEvent) {
         rxMessagePos = 0;
-        memset(&rxMessage, 0, I2C_BUFFER_MAX_LENGTH);
+        memset(&RxMessage, 0, I2C_BUFFER_MAX_LENGTH);
     } else if (prevEvent == kI2C_SlaveReceiveEvent && xfer->event == kI2C_SlaveCompletionEvent) {
-        ((uint8_t*)&rxMessage)[rxMessagePos] = byteIn;
-        rxMessage.length = rxMessagePos-3;
+        ((uint8_t*)&RxMessage)[rxMessagePos] = byteIn;
+        RxMessage.length = rxMessagePos-3;
         SlaveRxHandler();
     } else if (prevEvent == kI2C_SlaveReceiveEvent && xfer->event == kI2C_SlaveReceiveEvent) {
-        ((uint8_t*)&rxMessage)[rxMessagePos++] = byteIn;
+        ((uint8_t*)&RxMessage)[rxMessagePos++] = byteIn;
     }
 
     switch (xfer->event) {
         case kI2C_SlaveTransmitEvent:
             SlaveTxHandler();
-            xfer->data = (uint8_t*)&txMessage;
-            xfer->dataSize = txMessage.length+3;
+            xfer->data = (uint8_t*)&TxMessage;
+            xfer->dataSize = TxMessage.length+3;
             break;
         case kI2C_SlaveReceiveEvent:
             xfer->data = (uint8_t*)&byteIn;
diff --git a/left/src/slave_protocol_handler.c b/left/src/slave_protocol_handler.c
index 0f3a7f1..cb901e3 100644
--- a/left/src/slave_protocol_handler.c
+++ b/left/src/slave_protocol_handler.c
@@ -10,15 +10,15 @@
 #include "bool_array_converter.h"
 #include "bootloader.h"
 
-i2c_message_t rxMessage;
-i2c_message_t txMessage;
+i2c_message_t RxMessage;
+i2c_message_t TxMessage;
 
 void SetError(uint8_t error);
 void SetGenericError(void);
 void SetResponseByte(uint8_t response);
 
 void SetError(uint8_t error) {
-    txMessage.data[0] = error;
+    TxMessage.data[0] = error;
 }
 
 void SetGenericError(void)
@@ -29,21 +29,21 @@ void SetGenericError(void)
 // Set a single byte as the response.
 void SetResponseByte(uint8_t response)
 {
-    txMessage.data[1] = response;
+    TxMessage.data[1] = response;
 }
 
 void SlaveRxHandler(void)
 {
-    uint8_t commandId = rxMessage.data[0];
+    uint8_t commandId = RxMessage.data[0];
     switch (commandId) {
         case SlaveCommand_SetTestLed:
-            txMessage.length = 0;
-            bool isLedOn = rxMessage.data[1];
+            TxMessage.length = 0;
+            bool isLedOn = RxMessage.data[1];
             TEST_LED_SET(isLedOn);
             break;
         case SlaveCommand_SetLedPwmBrightness:
-            txMessage.length = 0;
-            uint8_t brightnessPercent = rxMessage.data[1];
+            TxMessage.length = 0;
+            uint8_t brightnessPercent = RxMessage.data[1];
             LedPwm_SetBrightness(brightnessPercent);
             break;
         case SlaveCommand_JumpToBootloader:
@@ -54,12 +54,12 @@ void SlaveRxHandler(void)
 
 void SlaveTxHandler(void)
 {
-    uint8_t commandId = rxMessage.data[0];
+    uint8_t commandId = RxMessage.data[0];
     switch (commandId) {
         case SlaveCommand_RequestKeyStates:
-            BoolBytesToBits(keyMatrix.keyStates, txMessage.data, LEFT_KEYBOARD_HALF_KEY_COUNT);
-            txMessage.length = KEY_STATE_SIZE;
-            CRC16_UpdateMessageChecksum(&txMessage);
+            BoolBytesToBits(keyMatrix.keyStates, TxMessage.data, LEFT_KEYBOARD_HALF_KEY_COUNT);
+            TxMessage.length = KEY_STATE_SIZE;
+            CRC16_UpdateMessageChecksum(&TxMessage);
             break;
     }
 }
diff --git a/left/src/slave_protocol_handler.h b/left/src/slave_protocol_handler.h
index ec67b38..9042e2f 100644
--- a/left/src/slave_protocol_handler.h
+++ b/left/src/slave_protocol_handler.h
@@ -17,8 +17,8 @@
 
 // Variables:
 
-    extern i2c_message_t rxMessage;
-    extern i2c_message_t txMessage;
+    extern i2c_message_t RxMessage;
+    extern i2c_message_t TxMessage;
 
 // Functions: