diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde
index 931e3e54b1..d29385c69d 100644
--- a/ArduPlane/ArduPlane.pde
+++ b/ArduPlane/ArduPlane.pde
@@ -79,8 +79,8 @@ Arduino_Mega_ISR_Registry isr_registry;
 ////////////////////////////////////////////////////////////////////////////////
 // APM_RC_Class Instance
 ////////////////////////////////////////////////////////////////////////////////
-#if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE
-    APM_RC_Purple APM_RC;
+#if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
+    APM_RC_APM2 APM_RC;
 #else
     APM_RC_APM1 APM_RC;
 #endif
@@ -88,8 +88,8 @@ Arduino_Mega_ISR_Registry isr_registry;
 ////////////////////////////////////////////////////////////////////////////////
 // Dataflash
 ////////////////////////////////////////////////////////////////////////////////
-#if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE
-    DataFlash_Purple DataFlash;
+#if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
+    DataFlash_APM2 DataFlash;
 #else
     DataFlash_APM1   DataFlash;
 #endif
diff --git a/ArduPlane/Makefile b/ArduPlane/Makefile
index 18c4057456..82832468f1 100644
--- a/ArduPlane/Makefile
+++ b/ArduPlane/Makefile
@@ -18,8 +18,8 @@ hilnocli:
 heli:
 	make -f Makefile EXTRAFLAGS="-DFRAME_CONFIG=HELI_FRAME"
 
-purple:
-	make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_PURPLE -DCLI_SLIDER_ENABLED=DISABLED"
+apm2:
+	make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DCLI_SLIDER_ENABLED=DISABLED"
 
 mavlink10:
 	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DMAVLINK10 -DCLI_ENABLED=DISABLED -DLOGGING_ENABLED=DISABLED"
diff --git a/ArduPlane/config.h b/ArduPlane/config.h
index 6342652de8..5a16637f21 100644
--- a/ArduPlane/config.h
+++ b/ArduPlane/config.h
@@ -51,10 +51,10 @@
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
-// PURPLE HARDWARE DEFAULTS
+// APM2 HARDWARE DEFAULTS
 //
 
-#if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE
+#if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
 # define CONFIG_IMU_TYPE   CONFIG_IMU_MPU6000
 # define CONFIG_PUSHBUTTON DISABLED
 # define CONFIG_RELAY      DISABLED
@@ -73,7 +73,7 @@
 # define SLIDE_SWITCH_PIN 40
 # define PUSHBUTTON_PIN   41
 # define USB_MUX_PIN      -1
-#elif CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE
+#elif CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
 # define A_LED_PIN        27
 # define B_LED_PIN        26
 # define C_LED_PIN        25
diff --git a/ArduPlane/control_modes.pde b/ArduPlane/control_modes.pde
index 6ce7dfbe85..26010e3cd3 100644
--- a/ArduPlane/control_modes.pde
+++ b/ArduPlane/control_modes.pde
@@ -40,7 +40,7 @@ static void reset_control_switch()
 
 static void update_servo_switches()
 {
-#if CONFIG_APM_HARDWARE != APM_HARDWARE_PURPLE
+#if CONFIG_APM_HARDWARE != APM_HARDWARE_APM2
 	if (!g.switch_enable) {
         // switches are disabled in EEPROM (see SWITCH_ENABLE option)
         // this means the EEPROM control of all channel reversal is enabled
diff --git a/ArduPlane/defines.h b/ArduPlane/defines.h
index 2367e6f3e9..afc3b892a9 100644
--- a/ArduPlane/defines.h
+++ b/ArduPlane/defines.h
@@ -226,6 +226,6 @@ enum gcs_severity {
 #define CONFIG_IMU_MPU6000 2
 
 #define APM_HARDWARE_APM1  1
-#define APM_HARDWARE_PURPLE 2
+#define APM_HARDWARE_APM2 2
 
 #endif // _DEFINES_H
diff --git a/ArduPlane/system.pde b/ArduPlane/system.pde
index 964c075d79..5834abb736 100644
--- a/ArduPlane/system.pde
+++ b/ArduPlane/system.pde
@@ -56,7 +56,7 @@ static void run_cli(void)
 static void init_ardupilot()
 {
 #if USB_MUX_PIN > 0
-    // on the purple board we have a mux thet switches UART0 between
+    // on the APM2 board we have a mux thet switches UART0 between
     // USB and the board header. If the right ArduPPM firmware is
     // installed we can detect if USB is connected using the
     // USB_MUX_PIN
@@ -176,7 +176,7 @@ static void init_ardupilot()
 
     adc.Init(&timer_scheduler);      // APM ADC library initialization
 
-#if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE
+#if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
 	barometer.Init(1, true);
 #else
 	barometer.Init(1, false);
diff --git a/ArduPlane/test.pde b/ArduPlane/test.pde
index 524a98bd30..9fb1625539 100644
--- a/ArduPlane/test.pde
+++ b/ArduPlane/test.pde
@@ -25,7 +25,7 @@ static int8_t	test_xbee(uint8_t argc, 		const Menu::arg *argv);
 static int8_t	test_eedump(uint8_t argc, 		const Menu::arg *argv);
 static int8_t	test_rawgps(uint8_t argc, 			const Menu::arg *argv);
 static int8_t	test_modeswitch(uint8_t argc, 		const Menu::arg *argv);
-#if CONFIG_APM_HARDWARE != APM_HARDWARE_PURPLE
+#if CONFIG_APM_HARDWARE != APM_HARDWARE_APM2
 static int8_t	test_dipswitches(uint8_t argc, 		const Menu::arg *argv);
 #endif
 
@@ -44,7 +44,7 @@ static const struct Menu::command test_menu_commands[] PROGMEM = {
 	{"xbee",		test_xbee},
 	{"eedump",		test_eedump},
 	{"modeswitch",	test_modeswitch},
-#if CONFIG_APM_HARDWARE != APM_HARDWARE_PURPLE
+#if CONFIG_APM_HARDWARE != APM_HARDWARE_APM2
 	{"dipswitches",	test_dipswitches},
 #endif
 
@@ -410,7 +410,7 @@ test_modeswitch(uint8_t argc, const Menu::arg *argv)
 	}
 }
 
-#if CONFIG_APM_HARDWARE != APM_HARDWARE_PURPLE
+#if CONFIG_APM_HARDWARE != APM_HARDWARE_APM2
 static int8_t
 test_dipswitches(uint8_t argc, const Menu::arg *argv)
 {
@@ -441,7 +441,7 @@ test_dipswitches(uint8_t argc, const Menu::arg *argv)
 		}
 	}
 }
-#endif // CONFIG_APM_HARDWARE != APM_HARDWARE_PURPLE
+#endif // CONFIG_APM_HARDWARE != APM_HARDWARE_APM2
 
 
 //-------------------------------------------------------------------------------------------