diff --git a/Makefile b/Makefile
index 7543dd7683..e4bc05df3e 100755
--- a/Makefile
+++ b/Makefile
@@ -44,14 +44,14 @@ FLASH_SIZE ?=
 FORKNAME              = inav
 
 CC3D_TARGETS       = CC3D CC3D_OPBL CC3D_PPM1
-NAZE_TARGETS       = ALIENWIIF1
+NAZE_TARGETS       = ALIENFLIGHTF1
 SPRACINGF3_TARGETS = IRCFUSIONF3 RMDO
 
 SDCARD_TARGETS     =
 SERIAL_USB_TARGETS = IRCFUSIONF3 SPRACINGF3
 
 # Valid targets for STM VCP support
-VCP_TARGETS = $(CC3D_TARGETS) ALIENWIIF3 CHEBUZZF3 COLIBRI_RACE LUX_RACE MOTOLAB SPARKY STM32F3DISCOVERY
+VCP_TARGETS = $(CC3D_TARGETS) ALIENFLIGHTF3 CHEBUZZF3 COLIBRI_RACE LUX_RACE MOTOLAB SPARKY STM32F3DISCOVERY
 
 # Valid targets for OP BootLoader support
 OPBL_TARGETS = CC3D_OPBL
@@ -61,15 +61,15 @@ F405_TARGETS    =
 F405_TARGETS_16 =
 F411_TARGETS    =
 
-F1_TARGETS    = $(CC3D_TARGETS) ALIENWIIF1 CJMCU EUSTM32F103RC NAZE OLIMEXINO PORT103R
-F3_TARGETS    = ALIENWIIF3 CHEBUZZF3 COLIBRI_RACE LUX_RACE MOTOLAB RMDO SPARKY SPRACINGF3 STM32F3DISCOVERY
+F1_TARGETS    = $(CC3D_TARGETS) ALIENFLIGHTF1 CJMCU EUSTM32F103RC NAZE OLIMEXINO PORT103R
+F3_TARGETS    = ALIENFLIGHTF3 CHEBUZZF3 COLIBRI_RACE LUX_RACE MOTOLAB RMDO SPARKY SPRACINGF3 STM32F3DISCOVERY
 F4_TARGETS    = $(F405_TARGETS) $(F405_TARGETS_16) $(F411_TARGETS)
 VALID_TARGETS = $(F1_TARGETS) $(F3_TARGETS) $(F4_TARGETS)
 
 
 64K_TARGETS   = CJMCU
-128K_TARGETS  = $(CC3D_TARGETS) ALIENWIIF1 NAZE OLIMEXINO RMDO
-256K_TARGETS  = ALIENWIIF3 CHEBUZZF3 COLIBRI_RACE EUSTM32F103RC LUX_RACE MOTOLAB PORT103R SPARKY SPRACINGF3 STM32F3DISCOVERY
+128K_TARGETS  = $(CC3D_TARGETS) ALIENFLIGHTF1 NAZE OLIMEXINO RMDO
+256K_TARGETS  = ALIENFLIGHTF3 CHEBUZZF3 COLIBRI_RACE EUSTM32F103RC LUX_RACE MOTOLAB PORT103R SPARKY SPRACINGF3 STM32F3DISCOVERY
 512K_TARGETS  = $(F411_TARGETS)
 1024K_TARGETS = $(F405_TARGETS) $(F405_TARGETS_16)
 
@@ -452,7 +452,7 @@ NAZE_SRC = \
             $(HIGHEND_SRC) \
             $(COMMON_SRC)
 
-ALIENWIIF1_SRC = $(NAZE_SRC)
+ALIENFLIGHTF1_SRC = $(NAZE_SRC)
 
 EUSTM32F103RC_SRC = \
             $(STM32F10x_COMMON_SRC) \
@@ -603,7 +603,7 @@ SPARKY_SRC = \
             $(COMMON_SRC) \
             $(VCP_SRC)
 
-ALIENWIIF3_SRC = \
+ALIENFLIGHTF3_SRC = \
             $(SPARKY_SRC)
 
 RMDO_SRC = \
diff --git a/src/main/config/config.c b/src/main/config/config.c
index ee21d663eb..a5c7a637d4 100755
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -606,9 +606,9 @@ static void resetConf(void)
     featureSet(FEATURE_FAILSAFE);
 #endif
 
-    // alternative defaults settings for ALIENWIIF1 and ALIENWIIF3 targets
-#ifdef ALIENWII32
-#ifdef ALIENWIIF3
+    // alternative defaults settings for ALIENFLIGHTF1 and ALIENFLIGHTF3 targets
+#ifdef ALIENFLIGHTF1
+#ifdef ALIENFLIGHTF3
     masterConfig.serialConfig.portConfigs[2].functionMask = FUNCTION_RX_SERIAL;
     masterConfig.batteryConfig.vbatscale = 20;
 #else
diff --git a/src/main/target/ALIENWIIF3/target.c b/src/main/target/ALIENFLIGHTF3/target.c
similarity index 100%
rename from src/main/target/ALIENWIIF3/target.c
rename to src/main/target/ALIENFLIGHTF3/target.c
diff --git a/src/main/target/ALIENWIIF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h
similarity index 97%
rename from src/main/target/ALIENWIIF3/target.h
rename to src/main/target/ALIENFLIGHTF3/target.h
index f1cbe18b21..1da127b125 100644
--- a/src/main/target/ALIENWIIF3/target.h
+++ b/src/main/target/ALIENFLIGHTF3/target.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#define TARGET_BOARD_IDENTIFIER "AWF3" // AlienWii32 F3.
+#define TARGET_BOARD_IDENTIFIER "AFF3" // ALIENFLIGHTF3
 
 #define LED0
 #define LED0_GPIO   GPIOB
@@ -116,8 +116,7 @@
 #define BIND_PORT  GPIOA
 #define BIND_PIN   Pin_3
 
-// alternative defaults for AlienWii32 F3 target
-#define ALIENWII32
+// alternative defaults for ALIENFLIGHTF3 target
 #define HARDWARE_BIND_PLUG
 
 // Hardware bind plug at PB12 (Pin 25)
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 9271fe15f1..4b1305593c 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -203,10 +203,10 @@
 
 #define TARGET_MOTOR_COUNT 8
 
-// alternative defaults for AlienWii32 F1 target
-#ifdef ALIENWII32
+// alternative defaults for ALIENFLIGHTF1 F1 target
+#ifdef ALIENFLIGHTF1
 #undef TARGET_BOARD_IDENTIFIER
-#define TARGET_BOARD_IDENTIFIER "AWF1" // AlienWii32 F1.
+#define TARGET_BOARD_IDENTIFIER "AFF1" // ALIENFLIGHTF1
 #undef BOARD_HAS_VOLTAGE_DIVIDER
 
 #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
@@ -216,7 +216,7 @@
 // Hardware bind plug at PB5 (Pin 41)
 #define BINDPLUG_PORT  GPIOB
 #define BINDPLUG_PIN   Pin_5
-#endif // ALIENWII32
+#endif // ALIENFLIGHTF1
 
 #ifdef MICROSKYSKY
 #undef TARGET_BOARD_IDENTIFIER