diff --git a/right/src/config_parser/config_globals.c b/right/src/config_parser/config_globals.c
index 6afe018..07e7ed1 100644
--- a/right/src/config_parser/config_globals.c
+++ b/right/src/config_parser/config_globals.c
@@ -5,7 +5,7 @@ config_buffer_t HardwareConfigBuffer = {hardwareConfig};
 
 static uint8_t userConfig1[USER_CONFIG_SIZE];
 static uint8_t __attribute__((section (".m_data_2"))) userConfig2[USER_CONFIG_SIZE];
-config_buffer_t UserConfigBuffer = { userConfig1 };
+config_buffer_t ValidatedUserConfigBuffer = { userConfig1 };
 config_buffer_t StagingUserConfigBuffer = { userConfig2 };
 
 bool ParserRunDry;
diff --git a/right/src/config_parser/config_globals.h b/right/src/config_parser/config_globals.h
index c94862f..c61bbda 100644
--- a/right/src/config_parser/config_globals.h
+++ b/right/src/config_parser/config_globals.h
@@ -16,7 +16,7 @@
 
     extern bool ParserRunDry;
     extern config_buffer_t HardwareConfigBuffer;
-    extern config_buffer_t UserConfigBuffer;
+    extern config_buffer_t ValidatedUserConfigBuffer;
     extern config_buffer_t StagingUserConfigBuffer;
 
 #endif
diff --git a/right/src/eeprom.c b/right/src/eeprom.c
index 8996028..700a304 100644
--- a/right/src/eeprom.c
+++ b/right/src/eeprom.c
@@ -66,7 +66,7 @@ static void i2cCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t st
                 return;
             }
             LastEepromTransferStatus = i2cAsyncRead(
-                isHardwareConfig ? HardwareConfigBuffer.buffer : UserConfigBuffer.buffer,
+                isHardwareConfig ? HardwareConfigBuffer.buffer : ValidatedUserConfigBuffer.buffer,
                 isHardwareConfig ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE
             );
             IsEepromBusy = true;
@@ -119,7 +119,7 @@ status_t EEPROM_LaunchTransfer(eeprom_transfer_t transferType, void (*successCal
             break;
         case EepromTransfer_WriteHardwareConfiguration:
         case EepromTransfer_WriteUserConfiguration:
-            sourceBuffer = isHardwareConfig ? HardwareConfigBuffer.buffer : UserConfigBuffer.buffer;
+            sourceBuffer = isHardwareConfig ? HardwareConfigBuffer.buffer : ValidatedUserConfigBuffer.buffer;
             sourceOffset = 0;
             sourceLength = isHardwareConfig ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE;
             LastEepromTransferStatus = writePage();
diff --git a/right/src/keymaps.c b/right/src/keymaps.c
index d8ddfbf..6d3595f 100644
--- a/right/src/keymaps.c
+++ b/right/src/keymaps.c
@@ -16,8 +16,8 @@ uint8_t CurrentKeymapIndex = 0;
 void Keymaps_Switch(uint8_t index)
 {
     CurrentKeymapIndex = index;
-    UserConfigBuffer.offset = AllKeymaps[index].offset;
-    ParseKeymap(&UserConfigBuffer, index, AllKeymapsCount, AllMacrosCount);
+    ValidatedUserConfigBuffer.offset = AllKeymaps[index].offset;
+    ParseKeymap(&ValidatedUserConfigBuffer, index, AllKeymapsCount, AllMacrosCount);
     LedDisplay_SetText(AllKeymaps[index].abbreviationLen, AllKeymaps[index].abbreviation);
 }
 
diff --git a/right/src/macros.c b/right/src/macros.c
index 1f355d2..900b3fc 100644
--- a/right/src/macros.c
+++ b/right/src/macros.c
@@ -276,8 +276,8 @@ void Macros_StartMacro(uint8_t index)
     MacroPlaying = true;
     currentMacroIndex = index;
     currentMacroActionIndex = 0;
-    UserConfigBuffer.offset = AllMacros[index].firstMacroActionOffset;
-    ParseMacroAction(&UserConfigBuffer, &currentMacroAction);
+    ValidatedUserConfigBuffer.offset = AllMacros[index].firstMacroActionOffset;
+    ParseMacroAction(&ValidatedUserConfigBuffer, &currentMacroAction);
     memset(&MacroMouseReport, 0, sizeof MacroMouseReport);
     memset(&MacroBasicKeyboardReport, 0, sizeof MacroBasicKeyboardReport);
     memset(&MacroMediaKeyboardReport, 0, sizeof MacroMediaKeyboardReport);
@@ -293,5 +293,5 @@ void Macros_ContinueMacro(void)
         MacroPlaying = false;
         return;
     }
-    ParseMacroAction(&UserConfigBuffer, &currentMacroAction);
+    ParseMacroAction(&ValidatedUserConfigBuffer, &currentMacroAction);
 }
diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c
index 0be3509..898610a 100644
--- a/right/src/usb_protocol_handler.c
+++ b/right/src/usb_protocol_handler.c
@@ -111,15 +111,15 @@ void ApplyConfig(void)
     oldKeymapAbbreviationLen = AllKeymaps[CurrentKeymapIndex].abbreviationLen;
 
     uint8_t *temp;
-    temp = UserConfigBuffer.buffer;
-    UserConfigBuffer.buffer = StagingUserConfigBuffer.buffer;
+    temp = ValidatedUserConfigBuffer.buffer;
+    ValidatedUserConfigBuffer.buffer = StagingUserConfigBuffer.buffer;
     StagingUserConfigBuffer.buffer = temp;
 
     ParserRunDry = false;
-    UserConfigBuffer.offset = 0;
-    GenericHidOutBuffer[0] = ParseConfig(&UserConfigBuffer);
-    GenericHidOutBuffer[1] = UserConfigBuffer.offset;
-    GenericHidOutBuffer[2] = UserConfigBuffer.offset >> 8;
+    ValidatedUserConfigBuffer.offset = 0;
+    GenericHidOutBuffer[0] = ParseConfig(&ValidatedUserConfigBuffer);
+    GenericHidOutBuffer[1] = ValidatedUserConfigBuffer.offset;
+    GenericHidOutBuffer[2] = ValidatedUserConfigBuffer.offset >> 8;
     GenericHidOutBuffer[3] = 1;
 
     if (GenericHidOutBuffer[0] != UsbResponse_Success) {