diff --git a/BootLoaders/Boards/orangetx/avrdude.conf b/BootLoaders/Boards/orangerx/avrdude.conf
similarity index 100%
rename from BootLoaders/Boards/orangetx/avrdude.conf
rename to BootLoaders/Boards/orangerx/avrdude.conf
diff --git a/BootLoaders/Boards/orangetx/boards.txt b/BootLoaders/Boards/orangerx/boards.txt
similarity index 85%
rename from BootLoaders/Boards/orangetx/boards.txt
rename to BootLoaders/Boards/orangerx/boards.txt
index 16be20a..0980eb8 100644
--- a/BootLoaders/Boards/orangetx/boards.txt
+++ b/BootLoaders/Boards/orangerx/boards.txt
@@ -4,10 +4,10 @@
 ##############################################################
 
 ##############################################################
-## Multi 4-in-1 (Orange TX)
+## Multi 4-in-1 (OrangeRX)
 ## --------------------------------------------------
-multixmega32d4.name=Multi 4-in-1 (Orange TX)
-multixmega32d4.build.board=MULTI_ORANGETX
+multixmega32d4.name=Multi 4-in-1 (OrangeRX)
+multixmega32d4.build.board=MULTI_ORANGERX
 multixmega32d4.upload.protocol=arduino
 multixmega32d4.upload.maximum_size=32768
 multixmega32d4.upload.speed=115200
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/Arduino.h b/BootLoaders/Boards/orangerx/cores/xmega/Arduino.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/Arduino.h
rename to BootLoaders/Boards/orangerx/cores/xmega/Arduino.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/CDC.cpp b/BootLoaders/Boards/orangerx/cores/xmega/CDC.cpp
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/CDC.cpp
rename to BootLoaders/Boards/orangerx/cores/xmega/CDC.cpp
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/Client.h b/BootLoaders/Boards/orangerx/cores/xmega/Client.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/Client.h
rename to BootLoaders/Boards/orangerx/cores/xmega/Client.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/HID.cpp b/BootLoaders/Boards/orangerx/cores/xmega/HID.cpp
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/HID.cpp
rename to BootLoaders/Boards/orangerx/cores/xmega/HID.cpp
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/HardwareSerial.cpp b/BootLoaders/Boards/orangerx/cores/xmega/HardwareSerial.cpp
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/HardwareSerial.cpp
rename to BootLoaders/Boards/orangerx/cores/xmega/HardwareSerial.cpp
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/HardwareSerial.h b/BootLoaders/Boards/orangerx/cores/xmega/HardwareSerial.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/HardwareSerial.h
rename to BootLoaders/Boards/orangerx/cores/xmega/HardwareSerial.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/IPAddress.cpp b/BootLoaders/Boards/orangerx/cores/xmega/IPAddress.cpp
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/IPAddress.cpp
rename to BootLoaders/Boards/orangerx/cores/xmega/IPAddress.cpp
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/IPAddress.h b/BootLoaders/Boards/orangerx/cores/xmega/IPAddress.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/IPAddress.h
rename to BootLoaders/Boards/orangerx/cores/xmega/IPAddress.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/Platform.h b/BootLoaders/Boards/orangerx/cores/xmega/Platform.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/Platform.h
rename to BootLoaders/Boards/orangerx/cores/xmega/Platform.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/Print.cpp b/BootLoaders/Boards/orangerx/cores/xmega/Print.cpp
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/Print.cpp
rename to BootLoaders/Boards/orangerx/cores/xmega/Print.cpp
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/Print.h b/BootLoaders/Boards/orangerx/cores/xmega/Print.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/Print.h
rename to BootLoaders/Boards/orangerx/cores/xmega/Print.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/Printable.h b/BootLoaders/Boards/orangerx/cores/xmega/Printable.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/Printable.h
rename to BootLoaders/Boards/orangerx/cores/xmega/Printable.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/Server.h b/BootLoaders/Boards/orangerx/cores/xmega/Server.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/Server.h
rename to BootLoaders/Boards/orangerx/cores/xmega/Server.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/Stream.cpp b/BootLoaders/Boards/orangerx/cores/xmega/Stream.cpp
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/Stream.cpp
rename to BootLoaders/Boards/orangerx/cores/xmega/Stream.cpp
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/Stream.h b/BootLoaders/Boards/orangerx/cores/xmega/Stream.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/Stream.h
rename to BootLoaders/Boards/orangerx/cores/xmega/Stream.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/Tone.cpp b/BootLoaders/Boards/orangerx/cores/xmega/Tone.cpp
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/Tone.cpp
rename to BootLoaders/Boards/orangerx/cores/xmega/Tone.cpp
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/USBAPI.h b/BootLoaders/Boards/orangerx/cores/xmega/USBAPI.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/USBAPI.h
rename to BootLoaders/Boards/orangerx/cores/xmega/USBAPI.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/USBCore.cpp b/BootLoaders/Boards/orangerx/cores/xmega/USBCore.cpp
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/USBCore.cpp
rename to BootLoaders/Boards/orangerx/cores/xmega/USBCore.cpp
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/USBCore.h b/BootLoaders/Boards/orangerx/cores/xmega/USBCore.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/USBCore.h
rename to BootLoaders/Boards/orangerx/cores/xmega/USBCore.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/USBDesc.h b/BootLoaders/Boards/orangerx/cores/xmega/USBDesc.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/USBDesc.h
rename to BootLoaders/Boards/orangerx/cores/xmega/USBDesc.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/Udp.h b/BootLoaders/Boards/orangerx/cores/xmega/Udp.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/Udp.h
rename to BootLoaders/Boards/orangerx/cores/xmega/Udp.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/WCharacter.h b/BootLoaders/Boards/orangerx/cores/xmega/WCharacter.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/WCharacter.h
rename to BootLoaders/Boards/orangerx/cores/xmega/WCharacter.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/WInterrupts.c b/BootLoaders/Boards/orangerx/cores/xmega/WInterrupts.c
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/WInterrupts.c
rename to BootLoaders/Boards/orangerx/cores/xmega/WInterrupts.c
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/WMath.cpp b/BootLoaders/Boards/orangerx/cores/xmega/WMath.cpp
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/WMath.cpp
rename to BootLoaders/Boards/orangerx/cores/xmega/WMath.cpp
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/WString.cpp b/BootLoaders/Boards/orangerx/cores/xmega/WString.cpp
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/WString.cpp
rename to BootLoaders/Boards/orangerx/cores/xmega/WString.cpp
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/WString.h b/BootLoaders/Boards/orangerx/cores/xmega/WString.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/WString.h
rename to BootLoaders/Boards/orangerx/cores/xmega/WString.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/avr-libc/malloc.c b/BootLoaders/Boards/orangerx/cores/xmega/avr-libc/malloc.c
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/avr-libc/malloc.c
rename to BootLoaders/Boards/orangerx/cores/xmega/avr-libc/malloc.c
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/avr-libc/realloc.c b/BootLoaders/Boards/orangerx/cores/xmega/avr-libc/realloc.c
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/avr-libc/realloc.c
rename to BootLoaders/Boards/orangerx/cores/xmega/avr-libc/realloc.c
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/avr-libc/sectionname.h b/BootLoaders/Boards/orangerx/cores/xmega/avr-libc/sectionname.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/avr-libc/sectionname.h
rename to BootLoaders/Boards/orangerx/cores/xmega/avr-libc/sectionname.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/avr-libc/stdlib_private.h b/BootLoaders/Boards/orangerx/cores/xmega/avr-libc/stdlib_private.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/avr-libc/stdlib_private.h
rename to BootLoaders/Boards/orangerx/cores/xmega/avr-libc/stdlib_private.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/binary.h b/BootLoaders/Boards/orangerx/cores/xmega/binary.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/binary.h
rename to BootLoaders/Boards/orangerx/cores/xmega/binary.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/main.cpp b/BootLoaders/Boards/orangerx/cores/xmega/main.cpp
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/main.cpp
rename to BootLoaders/Boards/orangerx/cores/xmega/main.cpp
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/new.cpp b/BootLoaders/Boards/orangerx/cores/xmega/new.cpp
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/new.cpp
rename to BootLoaders/Boards/orangerx/cores/xmega/new.cpp
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/new.h b/BootLoaders/Boards/orangerx/cores/xmega/new.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/new.h
rename to BootLoaders/Boards/orangerx/cores/xmega/new.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/wiring.c b/BootLoaders/Boards/orangerx/cores/xmega/wiring.c
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/wiring.c
rename to BootLoaders/Boards/orangerx/cores/xmega/wiring.c
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/wiring_analog.c b/BootLoaders/Boards/orangerx/cores/xmega/wiring_analog.c
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/wiring_analog.c
rename to BootLoaders/Boards/orangerx/cores/xmega/wiring_analog.c
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/wiring_digital.c b/BootLoaders/Boards/orangerx/cores/xmega/wiring_digital.c
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/wiring_digital.c
rename to BootLoaders/Boards/orangerx/cores/xmega/wiring_digital.c
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/wiring_private.h b/BootLoaders/Boards/orangerx/cores/xmega/wiring_private.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/wiring_private.h
rename to BootLoaders/Boards/orangerx/cores/xmega/wiring_private.h
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/wiring_pulse.c b/BootLoaders/Boards/orangerx/cores/xmega/wiring_pulse.c
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/wiring_pulse.c
rename to BootLoaders/Boards/orangerx/cores/xmega/wiring_pulse.c
diff --git a/BootLoaders/Boards/orangetx/cores/xmega/wiring_shift.c b/BootLoaders/Boards/orangerx/cores/xmega/wiring_shift.c
similarity index 100%
rename from BootLoaders/Boards/orangetx/cores/xmega/wiring_shift.c
rename to BootLoaders/Boards/orangerx/cores/xmega/wiring_shift.c
diff --git a/BootLoaders/Boards/orangetx/platform.local.txt b/BootLoaders/Boards/orangerx/platform.local.txt
similarity index 98%
rename from BootLoaders/Boards/orangetx/platform.local.txt
rename to BootLoaders/Boards/orangerx/platform.local.txt
index 6505a7b..28b3377 100644
--- a/BootLoaders/Boards/orangetx/platform.local.txt
+++ b/BootLoaders/Boards/orangerx/platform.local.txt
@@ -1,6 +1,6 @@
 ## Save hex
 recipe.output.tmp_file={build.project_name}.hex
-recipe.output.save_file=multi-otx.hex
+recipe.output.save_file=multi-orx.hex
 
 ## Override some platform.txt settings to create a .bin instead of a .hex file
 ## The two lines below can be uncommented to have the compiler create a .bin file instead of a .hex file
diff --git a/BootLoaders/Boards/orangetx/platform.txt b/BootLoaders/Boards/orangerx/platform.txt
similarity index 99%
rename from BootLoaders/Boards/orangetx/platform.txt
rename to BootLoaders/Boards/orangerx/platform.txt
index e94964f..da6dcb2 100644
--- a/BootLoaders/Boards/orangetx/platform.txt
+++ b/BootLoaders/Boards/orangerx/platform.txt
@@ -1,4 +1,4 @@
-name=Multi 4-in-1 Orange
+name=Multi 4-in-1 OrangeRX
 version=1.0.1
 
 # this was borrowed from the installed version of 'platform.txt'
diff --git a/BootLoaders/Boards/orangetx/tools/linux/do_version b/BootLoaders/Boards/orangerx/tools/linux/do_version
old mode 100755
new mode 100644
similarity index 99%
rename from BootLoaders/Boards/orangetx/tools/linux/do_version
rename to BootLoaders/Boards/orangerx/tools/linux/do_version
index b1bf153..184015b
--- a/BootLoaders/Boards/orangetx/tools/linux/do_version
+++ b/BootLoaders/Boards/orangerx/tools/linux/do_version
@@ -6,7 +6,7 @@ SKETCH_PATH=$3
 MULTI_BOARD=$4
 EXPORT_FLAG=$5
 
-MULTI_TYPE=otx
+MULTI_TYPE=orx
 
 if [ -e "$BUILD_PATH/sketch/Multiprotocol.h" ]; then
         MAJOR_VERSION=$(grep "VERSION_MAJOR" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}')
diff --git a/BootLoaders/Boards/orangetx/tools/linux64/do_version b/BootLoaders/Boards/orangerx/tools/linux64/do_version
old mode 100755
new mode 100644
similarity index 99%
rename from BootLoaders/Boards/orangetx/tools/linux64/do_version
rename to BootLoaders/Boards/orangerx/tools/linux64/do_version
index b1bf153..184015b
--- a/BootLoaders/Boards/orangetx/tools/linux64/do_version
+++ b/BootLoaders/Boards/orangerx/tools/linux64/do_version
@@ -6,7 +6,7 @@ SKETCH_PATH=$3
 MULTI_BOARD=$4
 EXPORT_FLAG=$5
 
-MULTI_TYPE=otx
+MULTI_TYPE=orx
 
 if [ -e "$BUILD_PATH/sketch/Multiprotocol.h" ]; then
         MAJOR_VERSION=$(grep "VERSION_MAJOR" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}')
diff --git a/BootLoaders/Boards/orangetx/tools/macosx/do_version b/BootLoaders/Boards/orangerx/tools/macosx/do_version
old mode 100755
new mode 100644
similarity index 99%
rename from BootLoaders/Boards/orangetx/tools/macosx/do_version
rename to BootLoaders/Boards/orangerx/tools/macosx/do_version
index b1bf153..184015b
--- a/BootLoaders/Boards/orangetx/tools/macosx/do_version
+++ b/BootLoaders/Boards/orangerx/tools/macosx/do_version
@@ -6,7 +6,7 @@ SKETCH_PATH=$3
 MULTI_BOARD=$4
 EXPORT_FLAG=$5
 
-MULTI_TYPE=otx
+MULTI_TYPE=orx
 
 if [ -e "$BUILD_PATH/sketch/Multiprotocol.h" ]; then
         MAJOR_VERSION=$(grep "VERSION_MAJOR" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}')
diff --git a/BootLoaders/Boards/orangetx/tools/win/do_version.bat b/BootLoaders/Boards/orangerx/tools/win/do_version.bat
similarity index 99%
rename from BootLoaders/Boards/orangetx/tools/win/do_version.bat
rename to BootLoaders/Boards/orangerx/tools/win/do_version.bat
index 009681e..af69adf 100644
--- a/BootLoaders/Boards/orangetx/tools/win/do_version.bat
+++ b/BootLoaders/Boards/orangerx/tools/win/do_version.bat
@@ -9,7 +9,7 @@ SET EXPORT_FLAG=%5
 
 REM ECHO Multi board: %MULTI_BOARD%
 
-SET MULTI_TYPE=otx
+SET MULTI_TYPE=orx
 
 IF EXIST "%1\sketch\Multiprotocol.h" (
   REM ECHO Getting Multi-MODULE firmware version from "%1\sketch\Multiprotocol.h"
diff --git a/BootLoaders/Boards/orangetx/variants/xmega32d4/pins_arduino.h b/BootLoaders/Boards/orangerx/variants/xmega32d4/pins_arduino.h
similarity index 100%
rename from BootLoaders/Boards/orangetx/variants/xmega32d4/pins_arduino.h
rename to BootLoaders/Boards/orangerx/variants/xmega32d4/pins_arduino.h
diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino
index fe2d536..a47237f 100644
--- a/Multiprotocol/Multiprotocol.ino
+++ b/Multiprotocol/Multiprotocol.ino
@@ -28,7 +28,7 @@
 #ifdef __arm__// Let's automatically select the board if arm is selected
 	#define STM32_BOARD
 #endif
-#if defined (ARDUINO_AVR_XMEGA32D4) || defined (ARDUINO_MULTI_ORANGETX)
+#if defined (ARDUINO_AVR_XMEGA32D4) || defined (ARDUINO_MULTI_ORANGERX)
 	#include "MultiOrange.h"
 #endif