diff --git a/Firmware/Chameleon-Mini/ChameleonFirmwareUpgrade.bat b/Firmware/Chameleon-Mini/ChameleonFirmwareUpgrade.bat
index 3746e43..eed771d 100644
--- a/Firmware/Chameleon-Mini/ChameleonFirmwareUpgrade.bat
+++ b/Firmware/Chameleon-Mini/ChameleonFirmwareUpgrade.bat
@@ -6,14 +6,14 @@ if not exist "%~dp0dfu-programmer.exe" (
 	exit
 )
 
-if not exist "%~dp0Chameleon-Mini.eep" (
-	echo Cannot find Chameleon-Mini.eep. Please run this .bat script in the same directory where Chameleon-Mini.eep and Chameleon-Mini.hex are saved.
+if not exist "%~dp0Chameleon-RevG.eep" (
+	echo Cannot find Chameleon-RevG.eep. Please run this .bat script in the same directory where Chameleon-RevG.eep and Chameleon-RevG.hex are saved.
 	pause > nul
 	exit
 )
 
-if not exist "%~dp0Chameleon-Mini.hex" (
-	echo Cannot find Chameleon-Mini.hex. Please run this .bat script in the same directory where Chameleon-Mini.eep and Chameleon-Mini.hex are saved.
+if not exist "%~dp0Chameleon-RevG.hex" (
+	echo Cannot find Chameleon-RevG.hex. Please run this .bat script in the same directory where Chameleon-RevG.eep and Chameleon-RevG.hex are saved.
 	pause > nul
 	exit
 )
@@ -26,7 +26,7 @@ IF %ERRORLEVEL% NEQ 0 (
 	exit
 )
 
-"%~dp0dfu-programmer.exe" atxmega128a4u flash-eeprom "%~dp0Chameleon-Mini.eep" --force
+"%~dp0dfu-programmer.exe" atxmega128a4u flash-eeprom "%~dp0Chameleon-RevG.eep" --force
 
 IF %ERRORLEVEL% NEQ 0 (
 	echo There was an error with executing this command. Maybe your ChameleonMini is not in bootloader mode?
@@ -34,7 +34,7 @@ IF %ERRORLEVEL% NEQ 0 (
 	exit
 )
 
-"%~dp0dfu-programmer.exe" atxmega128a4u flash "%~dp0Chameleon-Mini.hex"
+"%~dp0dfu-programmer.exe" atxmega128a4u flash "%~dp0Chameleon-RevG.hex"
 
 IF %ERRORLEVEL% NEQ 0 (
 	echo There was an error with executing this command. Maybe your ChameleonMini is not in bootloader mode?
diff --git a/Firmware/Chameleon-Mini/Terminal/CommandLine.c b/Firmware/Chameleon-Mini/Terminal/CommandLine.c
index a91c84a..1f1e4d5 100644
--- a/Firmware/Chameleon-Mini/Terminal/CommandLine.c
+++ b/Firmware/Chameleon-Mini/Terminal/CommandLine.c
@@ -330,14 +330,6 @@ const PROGMEM CommandEntryType CommandTable[] = {
         .SetFunc    = CommandSetSakMode,
         .GetFunc    = CommandGetSakMode
     },
-    {
-        /* This has to be last element */
-        .Command    = COMMAND_LIST_END,
-        .ExecFunc   = NO_FUNCTION,
-        .ExecParamFunc = NO_FUNCTION,
-        .SetFunc    = NO_FUNCTION,
-        .GetFunc    = NO_FUNCTION
-    },
     {
         .Command    = COMMAND_SETLEDMODE,
         .ExecFunc   = NO_FUNCTION,
@@ -359,6 +351,14 @@ const PROGMEM CommandEntryType CommandTable[] = {
 //    .SetFunc    = CommandSetBaudrate,
         .SetFunc    = NO_FUNCTION,
         .GetFunc    = CommandGetBaudrate,
+    },
+    {
+        /* This has to be last element */
+        .Command    = COMMAND_LIST_END,
+        .ExecFunc   = NO_FUNCTION,
+        .ExecParamFunc = NO_FUNCTION,
+        .SetFunc    = NO_FUNCTION,
+        .GetFunc    = NO_FUNCTION
     }
 };
 
diff --git a/Firmware/Chameleon-Mini/Terminal/Commands.h b/Firmware/Chameleon-Mini/Terminal/Commands.h
index 8d4b786..f4eebe0 100644
--- a/Firmware/Chameleon-Mini/Terminal/Commands.h
+++ b/Firmware/Chameleon-Mini/Terminal/Commands.h
@@ -195,9 +195,6 @@ CommandStatusIdType CommandSetUidMode(char *OutMessage, const char *InParam);
 CommandStatusIdType CommandGetSakMode(char *OutMessage);
 CommandStatusIdType CommandSetSakMode(char *OutMessage, const char *InParam);
 
-#define COMMAND_LIST_END    ""
-/* Defines the end of command list. This is no actual command */
-
 #define COMMAND_DETECTION   "DETECTION"
 CommandStatusIdType CommandGetDetection(char *OutParam);
 CommandStatusIdType CommandSetDetection(char *OutMessage, const char *InParam);
@@ -210,4 +207,7 @@ CommandStatusIdType CommandSetBaudrate(char *OutMessage, const char *InParam);
 CommandStatusIdType CommandGetLedMode(char *OutMessage);
 CommandStatusIdType CommandSetLedMode(char *OutMessage, const char *InParam);
 
+#define COMMAND_LIST_END    ""
+/* Defines the end of command list. This is no actual command */
+
 #endif /* COMMANDS_H_ */