diff --git a/src/main/target/DAFP_DARWINF722HD/config.c b/src/main/target/DARWINF722HD/config.c
similarity index 100%
rename from src/main/target/DAFP_DARWINF722HD/config.c
rename to src/main/target/DARWINF722HD/config.c
diff --git a/src/main/target/DAFP_DARWINF722HD/target.c b/src/main/target/DARWINF722HD/target.c
similarity index 100%
rename from src/main/target/DAFP_DARWINF722HD/target.c
rename to src/main/target/DARWINF722HD/target.c
diff --git a/src/main/target/DAFP_DARWINF722HD/target.h b/src/main/target/DARWINF722HD/target.h
similarity index 100%
rename from src/main/target/DAFP_DARWINF722HD/target.h
rename to src/main/target/DARWINF722HD/target.h
diff --git a/src/main/target/DAFP_DARWINF722HD/target.mk b/src/main/target/DARWINF722HD/target.mk
similarity index 100%
rename from src/main/target/DAFP_DARWINF722HD/target.mk
rename to src/main/target/DARWINF722HD/target.mk
diff --git a/src/main/target/FLWO_FLYWOOF411FR/target.c b/src/main/target/FLYWOOF411FR/target.c
similarity index 100%
rename from src/main/target/FLWO_FLYWOOF411FR/target.c
rename to src/main/target/FLYWOOF411FR/target.c
diff --git a/src/main/target/FLWO_FLYWOOF411FR/target.h b/src/main/target/FLYWOOF411FR/target.h
similarity index 100%
rename from src/main/target/FLWO_FLYWOOF411FR/target.h
rename to src/main/target/FLYWOOF411FR/target.h
diff --git a/src/main/target/FLWO_FLYWOOF411FR/target.mk b/src/main/target/FLYWOOF411FR/target.mk
similarity index 100%
rename from src/main/target/FLWO_FLYWOOF411FR/target.mk
rename to src/main/target/FLYWOOF411FR/target.mk
diff --git a/src/main/target/FLWO_FLYWOOF411V2/target.c b/src/main/target/FLYWOOF411V2/target.c
similarity index 100%
rename from src/main/target/FLWO_FLYWOOF411V2/target.c
rename to src/main/target/FLYWOOF411V2/target.c
diff --git a/src/main/target/FLWO_FLYWOOF411V2/target.h b/src/main/target/FLYWOOF411V2/target.h
similarity index 100%
rename from src/main/target/FLWO_FLYWOOF411V2/target.h
rename to src/main/target/FLYWOOF411V2/target.h
diff --git a/src/main/target/FLWO_FLYWOOF411V2/target.mk b/src/main/target/FLYWOOF411V2/target.mk
similarity index 100%
rename from src/main/target/FLWO_FLYWOOF411V2/target.mk
rename to src/main/target/FLYWOOF411V2/target.mk
diff --git a/src/main/target/TURC_FPVCYCLEF401/target.c b/src/main/target/FPVCYCLEF401/target.c
similarity index 100%
rename from src/main/target/TURC_FPVCYCLEF401/target.c
rename to src/main/target/FPVCYCLEF401/target.c
diff --git a/src/main/target/TURC_FPVCYCLEF401/target.h b/src/main/target/FPVCYCLEF401/target.h
similarity index 100%
rename from src/main/target/TURC_FPVCYCLEF401/target.h
rename to src/main/target/FPVCYCLEF401/target.h
diff --git a/src/main/target/TURC_FPVCYCLEF401/target.mk b/src/main/target/FPVCYCLEF401/target.mk
similarity index 100%
rename from src/main/target/TURC_FPVCYCLEF401/target.mk
rename to src/main/target/FPVCYCLEF401/target.mk
diff --git a/src/main/target/HOWI_HOBBYWING_XROTORF7CONV/target.c b/src/main/target/HOBBYWING_XROTORF7CONV/target.c
similarity index 100%
rename from src/main/target/HOWI_HOBBYWING_XROTORF7CONV/target.c
rename to src/main/target/HOBBYWING_XROTORF7CONV/target.c
diff --git a/src/main/target/HOWI_HOBBYWING_XROTORF7CONV/target.h b/src/main/target/HOBBYWING_XROTORF7CONV/target.h
similarity index 100%
rename from src/main/target/HOWI_HOBBYWING_XROTORF7CONV/target.h
rename to src/main/target/HOBBYWING_XROTORF7CONV/target.h
diff --git a/src/main/target/HOWI_HOBBYWING_XROTORF7CONV/target.mk b/src/main/target/HOBBYWING_XROTORF7CONV/target.mk
similarity index 100%
rename from src/main/target/HOWI_HOBBYWING_XROTORF7CONV/target.mk
rename to src/main/target/HOBBYWING_XROTORF7CONV/target.mk
diff --git a/src/main/target/IFLIGHT_BLITZ_F405/target.h b/src/main/target/IFLIGHT_BLITZ_F405/target.h
index 45e86da05b..bb0d69a611 100644
--- a/src/main/target/IFLIGHT_BLITZ_F405/target.h
+++ b/src/main/target/IFLIGHT_BLITZ_F405/target.h
@@ -21,9 +21,11 @@
 
 //#define USE_TARGET_CONFIG
 
-#define TARGET_BOARD_IDENTIFIER	"IBF4"
-#define TARGET_MANUFACTURER_IDENTIFIER	"IFRC"
-#define USBD_PRODUCT_STRING	"IFLIGHT_BLITZ_F405"
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
+#define USBD_PRODUCT_STRING "IFLIGHT_BLITZ_F405"
+
+#define FC_TARGET_MCU     STM32F405     // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S405"  // generic ID
 
 #define LED0_PIN                PC15
 
diff --git a/src/main/target/IFF4_TWIN_G/IFF4_TWIN_G_M.mk b/src/main/target/IFLIGHT_F405_TWING/IFLIGHT_F405_TWING_M.mk.bak
similarity index 100%
rename from src/main/target/IFF4_TWIN_G/IFF4_TWIN_G_M.mk
rename to src/main/target/IFLIGHT_F405_TWING/IFLIGHT_F405_TWING_M.mk.bak
diff --git a/src/main/target/IFF4_AIO/target.c b/src/main/target/IFLIGHT_F405_TWING/target.c
similarity index 100%
rename from src/main/target/IFF4_AIO/target.c
rename to src/main/target/IFLIGHT_F405_TWING/target.c
diff --git a/src/main/target/IFF4_TWIN_G/target.h b/src/main/target/IFLIGHT_F405_TWING/target.h
similarity index 96%
rename from src/main/target/IFF4_TWIN_G/target.h
rename to src/main/target/IFLIGHT_F405_TWING/target.h
index 9253ffe9e7..c8a693f7c9 100644
--- a/src/main/target/IFF4_TWIN_G/target.h
+++ b/src/main/target/IFLIGHT_F405_TWING/target.h
@@ -20,12 +20,12 @@
 
 #pragma once
 
-#if defined(IFF4_TWIN_G_M)
+#if defined(IFLIGHT_F405_TWING_M)
 #define TARGET_BOARD_IDENTIFIER "S405"
-#define USBD_PRODUCT_STRING "IFLIGHTF4TWIN_G_mpu6000"
+#define USBD_PRODUCT_STRING "IFLIGHT_F405_TWING_M"
 #else
 #define TARGET_BOARD_IDENTIFIER "S405"
-#define USBD_PRODUCT_STRING "IFLIGHTF4TWIN_G"
+#define USBD_PRODUCT_STRING "IFLIGHT_F405_TWING"
 #endif
 
 #define USE_DSHOT_DMAR
@@ -47,7 +47,7 @@
 #define PINIO1_PIN              PC14
 #define PINIO2_PIN              PC15
 
-#if defined(IFF4_TWIN_G_M)
+#if defined(IFLIGHT_F405_TWING_M)
 #define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_EXTI
diff --git a/src/main/target/IFF4_TWIN_G/target.mk b/src/main/target/IFLIGHT_F405_TWING/target.mk
similarity index 100%
rename from src/main/target/IFF4_TWIN_G/target.mk
rename to src/main/target/IFLIGHT_F405_TWING/target.mk
diff --git a/src/main/target/IFF4_TWIN_G/target.c b/src/main/target/IFLIGHT_F411_AIO32/target.c
similarity index 100%
rename from src/main/target/IFF4_TWIN_G/target.c
rename to src/main/target/IFLIGHT_F411_AIO32/target.c
diff --git a/src/main/target/IFF4_AIO/target.h b/src/main/target/IFLIGHT_F411_AIO32/target.h
similarity index 94%
rename from src/main/target/IFF4_AIO/target.h
rename to src/main/target/IFLIGHT_F411_AIO32/target.h
index 0851f4f9e4..057462579d 100644
--- a/src/main/target/IFF4_AIO/target.h
+++ b/src/main/target/IFLIGHT_F411_AIO32/target.h
@@ -20,8 +20,11 @@
 
 #pragma once
 
-#define TARGET_BOARD_IDENTIFIER "S411"
-#define USBD_PRODUCT_STRING "IFLIGHT F411 AIO"
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
+#define USBD_PRODUCT_STRING "IFLIGHT_F411_AIO32"
+
+#define FC_TARGET_MCU     STM32F411     // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S411"  // generic ID
 
 #define LED0_PIN                  PB5
 
diff --git a/src/main/target/IFF4_AIO/target.mk b/src/main/target/IFLIGHT_F411_AIO32/target.mk
similarity index 100%
rename from src/main/target/IFF4_AIO/target.mk
rename to src/main/target/IFLIGHT_F411_AIO32/target.mk
diff --git a/src/main/target/IFF411_PRO/target.c b/src/main/target/IFLIGHT_F411_PRO/target.c
similarity index 100%
rename from src/main/target/IFF411_PRO/target.c
rename to src/main/target/IFLIGHT_F411_PRO/target.c
diff --git a/src/main/target/IFF411_PRO/target.h b/src/main/target/IFLIGHT_F411_PRO/target.h
similarity index 96%
rename from src/main/target/IFF411_PRO/target.h
rename to src/main/target/IFLIGHT_F411_PRO/target.h
index d84e8ed6f4..2539723608 100644
--- a/src/main/target/IFF411_PRO/target.h
+++ b/src/main/target/IFLIGHT_F411_PRO/target.h
@@ -19,8 +19,12 @@
  */
 
 #pragma once
-#define TARGET_BOARD_IDENTIFIER                          "S411"
-#define USBD_PRODUCT_STRING                              "IFLIGHT F411 PRO"
+
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
+#define USBD_PRODUCT_STRING "IFLIGHT_F411_PRO"
+
+#define FC_TARGET_MCU     STM32F411     // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S411"  // generic ID
 
 #define ENABLE_DSHOT_DMAR                                true
 
diff --git a/src/main/target/IFF411_PRO/target.mk b/src/main/target/IFLIGHT_F411_PRO/target.mk
similarity index 100%
rename from src/main/target/IFF411_PRO/target.mk
rename to src/main/target/IFLIGHT_F411_PRO/target.mk
diff --git a/src/main/target/IFRC_IFLIGHT_SUCCEX_E_F7/target.c b/src/main/target/IFLIGHT_F722_TWING/target.c
similarity index 100%
rename from src/main/target/IFRC_IFLIGHT_SUCCEX_E_F7/target.c
rename to src/main/target/IFLIGHT_F722_TWING/target.c
diff --git a/src/main/target/IFF7_TWIN_G/target.h b/src/main/target/IFLIGHT_F722_TWING/target.h
similarity index 95%
rename from src/main/target/IFF7_TWIN_G/target.h
rename to src/main/target/IFLIGHT_F722_TWING/target.h
index dcaf56de6f..535a4b68b0 100644
--- a/src/main/target/IFF7_TWIN_G/target.h
+++ b/src/main/target/IFLIGHT_F722_TWING/target.h
@@ -20,9 +20,11 @@
 
 #pragma once
 
-#define TARGET_BOARD_IDENTIFIER "S7X2"
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
+#define USBD_PRODUCT_STRING "IFLIGHT_F722_TWING"
 
-#define USBD_PRODUCT_STRING     "IFLIGHT F7 TWIN G"
+#define FC_TARGET_MCU     STM32F7X2     // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S7X2"  // generic ID
 
 #define USE_DUAL_GYRO
 
diff --git a/src/main/target/IFF7_TWIN_G/target.mk b/src/main/target/IFLIGHT_F722_TWING/target.mk
similarity index 100%
rename from src/main/target/IFF7_TWIN_G/target.mk
rename to src/main/target/IFLIGHT_F722_TWING/target.mk
diff --git a/src/main/target/IFRC_IFLIGHT_F745_AIO/target.c b/src/main/target/IFLIGHT_F745_AIO/target.c
similarity index 100%
rename from src/main/target/IFRC_IFLIGHT_F745_AIO/target.c
rename to src/main/target/IFLIGHT_F745_AIO/target.c
diff --git a/src/main/target/IFRC_IFLIGHT_F745_AIO/target.h b/src/main/target/IFLIGHT_F745_AIO/target.h
similarity index 96%
rename from src/main/target/IFRC_IFLIGHT_F745_AIO/target.h
rename to src/main/target/IFLIGHT_F745_AIO/target.h
index 0cf4b6b8b7..c32ed746ed 100644
--- a/src/main/target/IFRC_IFLIGHT_F745_AIO/target.h
+++ b/src/main/target/IFLIGHT_F745_AIO/target.h
@@ -20,10 +20,12 @@
 
 #pragma once
 
-#define TARGET_BOARD_IDENTIFIER "IFRC"
-
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
 #define USBD_PRODUCT_STRING "IFLIGHT_F745_AIO"
 
+#define FC_TARGET_MCU     STM32F745     // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S745"  // generic ID
+
 #define LED0_PIN   PC13
 
 #define USE_BEEPER
diff --git a/src/main/target/IFRC_IFLIGHT_F745_AIO/target.mk b/src/main/target/IFLIGHT_F745_AIO/target.mk
similarity index 100%
rename from src/main/target/IFRC_IFLIGHT_F745_AIO/target.mk
rename to src/main/target/IFLIGHT_F745_AIO/target.mk
diff --git a/src/main/target/IFLIGHT_F745_AIO_V2/target.h b/src/main/target/IFLIGHT_F745_AIO_V2/target.h
index e771a75672..e9a9e73836 100644
--- a/src/main/target/IFLIGHT_F745_AIO_V2/target.h
+++ b/src/main/target/IFLIGHT_F745_AIO_V2/target.h
@@ -20,10 +20,12 @@
 
 #pragma once
 
-#define TARGET_BOARD_IDENTIFIER "IFRC"
-
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
 #define USBD_PRODUCT_STRING "IFLIGHT_F745_AIO_V2"
 
+#define FC_TARGET_MCU     STM32F745     // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S745"  // generic ID
+
 #define ENABLE_DSHOT_DMAR       true
 
 #define LED0_PIN   PC13
diff --git a/src/main/target/IFF4_E/target.c b/src/main/target/IFLIGHT_SUCCEX_E_F4/target.c
similarity index 100%
rename from src/main/target/IFF4_E/target.c
rename to src/main/target/IFLIGHT_SUCCEX_E_F4/target.c
diff --git a/src/main/target/IFF4_E/target.h b/src/main/target/IFLIGHT_SUCCEX_E_F4/target.h
similarity index 95%
rename from src/main/target/IFF4_E/target.h
rename to src/main/target/IFLIGHT_SUCCEX_E_F4/target.h
index fb0ea6a4eb..a52e5907db 100644
--- a/src/main/target/IFF4_E/target.h
+++ b/src/main/target/IFLIGHT_SUCCEX_E_F4/target.h
@@ -20,8 +20,11 @@
 
 #pragma once
 
-#define TARGET_BOARD_IDENTIFIER       "IFRC"
-#define USBD_PRODUCT_STRING           "IFLIGHT SUCCEX E F4"
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
+#define USBD_PRODUCT_STRING "IFLIGHT_SUCCEX_E_F4"
+
+#define FC_TARGET_MCU     STM32F405     // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S405"  // generic ID
 
 #define LED0_PIN                      PB5
 
@@ -105,9 +108,6 @@
 #define SPI3_MISO_PIN                 PC11
 #define SPI3_MOSI_PIN                 PC12
 
-#define USE_BARO
-#define USE_BARO_BMP280
-
 #define USE_I2C
 #define USE_I2C_DEVICE_2
 #define I2C2_SCL                      PB10
diff --git a/src/main/target/IFRC_IFLIGHT_SUCCEX_E_F4/target.mk b/src/main/target/IFLIGHT_SUCCEX_E_F4/target.mk
similarity index 100%
rename from src/main/target/IFRC_IFLIGHT_SUCCEX_E_F4/target.mk
rename to src/main/target/IFLIGHT_SUCCEX_E_F4/target.mk
diff --git a/src/main/target/IFRC_IFLIGHT_SUCCEX_E_F7/config.c b/src/main/target/IFLIGHT_SUCCEX_E_F7/config.c
similarity index 100%
rename from src/main/target/IFRC_IFLIGHT_SUCCEX_E_F7/config.c
rename to src/main/target/IFLIGHT_SUCCEX_E_F7/config.c
diff --git a/src/main/target/IFF7_TWIN_G/target.c b/src/main/target/IFLIGHT_SUCCEX_E_F7/target.c
similarity index 100%
rename from src/main/target/IFF7_TWIN_G/target.c
rename to src/main/target/IFLIGHT_SUCCEX_E_F7/target.c
diff --git a/src/main/target/IFRC_IFLIGHT_SUCCEX_E_F7/target.h b/src/main/target/IFLIGHT_SUCCEX_E_F7/target.h
similarity index 95%
rename from src/main/target/IFRC_IFLIGHT_SUCCEX_E_F7/target.h
rename to src/main/target/IFLIGHT_SUCCEX_E_F7/target.h
index 80fa7fbab1..4a93895a28 100644
--- a/src/main/target/IFRC_IFLIGHT_SUCCEX_E_F7/target.h
+++ b/src/main/target/IFLIGHT_SUCCEX_E_F7/target.h
@@ -20,9 +20,11 @@
 
 #pragma once
 
-#define TARGET_BOARD_IDENTIFIER "S7X2"
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
+#define USBD_PRODUCT_STRING "IFLIGHT_SUCCEX_E_F7"
 
-#define USBD_PRODUCT_STRING     "IFLIGHT_SUCCEX_E_F7"
+#define FC_TARGET_MCU     STM32F7X2     // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S7X2"  // generic ID
 
 #define ENABLE_DSHOT_DMAR       true
 
diff --git a/src/main/target/IFRC_IFLIGHT_SUCCEX_E_F7/target.mk b/src/main/target/IFLIGHT_SUCCEX_E_F7/target.mk
similarity index 100%
rename from src/main/target/IFRC_IFLIGHT_SUCCEX_E_F7/target.mk
rename to src/main/target/IFLIGHT_SUCCEX_E_F7/target.mk
diff --git a/src/main/target/IFRC_IFLIGHT_SUCCEX_E_F4/target.c b/src/main/target/IFLIGHT_SUCCEX_MINI_F4/target.c
similarity index 100%
rename from src/main/target/IFRC_IFLIGHT_SUCCEX_E_F4/target.c
rename to src/main/target/IFLIGHT_SUCCEX_MINI_F4/target.c
diff --git a/src/main/target/IFRC_IFLIGHT_SUCCEX_E_F4/target.h b/src/main/target/IFLIGHT_SUCCEX_MINI_F4/target.h
similarity index 93%
rename from src/main/target/IFRC_IFLIGHT_SUCCEX_E_F4/target.h
rename to src/main/target/IFLIGHT_SUCCEX_MINI_F4/target.h
index 634e216822..5042c44db7 100644
--- a/src/main/target/IFRC_IFLIGHT_SUCCEX_E_F4/target.h
+++ b/src/main/target/IFLIGHT_SUCCEX_MINI_F4/target.h
@@ -20,8 +20,11 @@
 
 #pragma once
 
-#define TARGET_BOARD_IDENTIFIER       "IFRC"
-#define USBD_PRODUCT_STRING           "IFLIGHT SUCCEX E F4"
+#define TARGET_MANUFACTURER_IDENTIFIER "IFRC"
+#define USBD_PRODUCT_STRING            "IFLIGHT_SUCCEX_MINI_F4"
+
+#define FC_TARGET_MCU     STM32F405     // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S405"  // generic ID
 
 #define LED0_PIN                      PB5
 
@@ -105,6 +108,9 @@
 #define SPI3_MISO_PIN                 PC11
 #define SPI3_MOSI_PIN                 PC12
 
+#define USE_BARO
+#define USE_BARO_BMP280
+
 #define USE_I2C
 #define USE_I2C_DEVICE_2
 #define I2C2_SCL                      PB10
diff --git a/src/main/target/IFF4_E/target.mk b/src/main/target/IFLIGHT_SUCCEX_MINI_F4/target.mk
similarity index 100%
rename from src/main/target/IFF4_E/target.mk
rename to src/main/target/IFLIGHT_SUCCEX_MINI_F4/target.mk
diff --git a/src/main/target/IFRC_JBF7/config.c b/src/main/target/JBF7/config.c
similarity index 100%
rename from src/main/target/IFRC_JBF7/config.c
rename to src/main/target/JBF7/config.c
diff --git a/src/main/target/IFRC_JBF7/target.c b/src/main/target/JBF7/target.c
similarity index 100%
rename from src/main/target/IFRC_JBF7/target.c
rename to src/main/target/JBF7/target.c
diff --git a/src/main/target/IFRC_JBF7/target.h b/src/main/target/JBF7/target.h
similarity index 100%
rename from src/main/target/IFRC_JBF7/target.h
rename to src/main/target/JBF7/target.h
diff --git a/src/main/target/IFRC_JBF7/target.mk b/src/main/target/JBF7/target.mk
similarity index 100%
rename from src/main/target/IFRC_JBF7/target.mk
rename to src/main/target/JBF7/target.mk
diff --git a/src/main/target/DIAT_MAMBAF405US/DIAT_MAMBAF405US_I2C.mk b/src/main/target/MAMBAF405US/MAMBAF405US_I2C.mk
similarity index 100%
rename from src/main/target/DIAT_MAMBAF405US/DIAT_MAMBAF405US_I2C.mk
rename to src/main/target/MAMBAF405US/MAMBAF405US_I2C.mk
diff --git a/src/main/target/DIAT_MAMBAF405US/config.c b/src/main/target/MAMBAF405US/config.c
similarity index 100%
rename from src/main/target/DIAT_MAMBAF405US/config.c
rename to src/main/target/MAMBAF405US/config.c
diff --git a/src/main/target/DIAT_MAMBAF405US/target.c b/src/main/target/MAMBAF405US/target.c
similarity index 100%
rename from src/main/target/DIAT_MAMBAF405US/target.c
rename to src/main/target/MAMBAF405US/target.c
diff --git a/src/main/target/DIAT_MAMBAF405US/target.h b/src/main/target/MAMBAF405US/target.h
similarity index 98%
rename from src/main/target/DIAT_MAMBAF405US/target.h
rename to src/main/target/MAMBAF405US/target.h
index d2ffbb529c..8dcd92d716 100644
--- a/src/main/target/DIAT_MAMBAF405US/target.h
+++ b/src/main/target/MAMBAF405US/target.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#if defined(DIAT_MAMBAF405US_I2C)
+#if defined(MAMBAF405US_I2C)
 #define TARGET_BOARD_IDENTIFIER "S405"
 #define USBD_PRODUCT_STRING "MAMBAF405US I2C"
 #else
@@ -79,7 +79,7 @@
 #define USE_I2C
 #define USE_I2C_DEVICE_2
 #define I2C_DEVICE              (I2CDEV_2)
-#if defined(DIAT_MAMBAF405US_I2C)
+#if defined(MAMBAF405US_I2C)
 #define I2C2_SCL                PB8        // SCL pad  PB10, shared with UART3TX
 #define I2C2_SDA                PB9        // SDA pad  PB11, shared with UART3RX
 #else
diff --git a/src/main/target/DIAT_MAMBAF405US/target.mk b/src/main/target/MAMBAF405US/target.mk
similarity index 100%
rename from src/main/target/DIAT_MAMBAF405US/target.mk
rename to src/main/target/MAMBAF405US/target.mk
diff --git a/src/main/target/DIAT_MAMBAF405_2022B/target.c b/src/main/target/MAMBAF405_2022B/target.c
similarity index 100%
rename from src/main/target/DIAT_MAMBAF405_2022B/target.c
rename to src/main/target/MAMBAF405_2022B/target.c
diff --git a/src/main/target/DIAT_MAMBAF405_2022B/target.h b/src/main/target/MAMBAF405_2022B/target.h
similarity index 100%
rename from src/main/target/DIAT_MAMBAF405_2022B/target.h
rename to src/main/target/MAMBAF405_2022B/target.h
diff --git a/src/main/target/DIAT_MAMBAF405_2022B/target.mk b/src/main/target/MAMBAF405_2022B/target.mk
similarity index 100%
rename from src/main/target/DIAT_MAMBAF405_2022B/target.mk
rename to src/main/target/MAMBAF405_2022B/target.mk
diff --git a/src/main/target/TEBS_PODRACERAIO/target.c b/src/main/target/PODRACERAIO/target.c
similarity index 100%
rename from src/main/target/TEBS_PODRACERAIO/target.c
rename to src/main/target/PODRACERAIO/target.c
diff --git a/src/main/target/TEBS_PODRACERAIO/target.h b/src/main/target/PODRACERAIO/target.h
similarity index 100%
rename from src/main/target/TEBS_PODRACERAIO/target.h
rename to src/main/target/PODRACERAIO/target.h
diff --git a/src/main/target/TEBS_PODRACERAIO/target.mk b/src/main/target/PODRACERAIO/target.mk
similarity index 100%
rename from src/main/target/TEBS_PODRACERAIO/target.mk
rename to src/main/target/PODRACERAIO/target.mk
diff --git a/src/main/target/SPBE_SPEEDYBEEF7V3/target.c b/src/main/target/SPEEDYBEEF7V3/target.c
similarity index 100%
rename from src/main/target/SPBE_SPEEDYBEEF7V3/target.c
rename to src/main/target/SPEEDYBEEF7V3/target.c
diff --git a/src/main/target/SPBE_SPEEDYBEEF7V3/target.h b/src/main/target/SPEEDYBEEF7V3/target.h
similarity index 100%
rename from src/main/target/SPBE_SPEEDYBEEF7V3/target.h
rename to src/main/target/SPEEDYBEEF7V3/target.h
diff --git a/src/main/target/SPBE_SPEEDYBEEF7V3/target.mk b/src/main/target/SPEEDYBEEF7V3/target.mk
similarity index 100%
rename from src/main/target/SPBE_SPEEDYBEEF7V3/target.mk
rename to src/main/target/SPEEDYBEEF7V3/target.mk
diff --git a/src/main/target/HENA_TALONF7DJIHD/config.c b/src/main/target/TALONF7DJIHD/config.c
similarity index 100%
rename from src/main/target/HENA_TALONF7DJIHD/config.c
rename to src/main/target/TALONF7DJIHD/config.c
diff --git a/src/main/target/HENA_TALONF7DJIHD/target.c b/src/main/target/TALONF7DJIHD/target.c
similarity index 100%
rename from src/main/target/HENA_TALONF7DJIHD/target.c
rename to src/main/target/TALONF7DJIHD/target.c
diff --git a/src/main/target/HENA_TALONF7DJIHD/target.h b/src/main/target/TALONF7DJIHD/target.h
similarity index 100%
rename from src/main/target/HENA_TALONF7DJIHD/target.h
rename to src/main/target/TALONF7DJIHD/target.h
diff --git a/src/main/target/HENA_TALONF7DJIHD/target.mk b/src/main/target/TALONF7DJIHD/target.mk
similarity index 100%
rename from src/main/target/HENA_TALONF7DJIHD/target.mk
rename to src/main/target/TALONF7DJIHD/target.mk
diff --git a/src/main/target/TMTR_TMOTORF4/config.c b/src/main/target/TMOTORF4/config.c
similarity index 100%
rename from src/main/target/TMTR_TMOTORF4/config.c
rename to src/main/target/TMOTORF4/config.c
diff --git a/src/main/target/TMTR_TMOTORF4/target.c b/src/main/target/TMOTORF4/target.c
similarity index 100%
rename from src/main/target/TMTR_TMOTORF4/target.c
rename to src/main/target/TMOTORF4/target.c
diff --git a/src/main/target/TMTR_TMOTORF4/target.h b/src/main/target/TMOTORF4/target.h
similarity index 100%
rename from src/main/target/TMTR_TMOTORF4/target.h
rename to src/main/target/TMOTORF4/target.h
diff --git a/src/main/target/TMTR_TMOTORF4/target.mk b/src/main/target/TMOTORF4/target.mk
similarity index 100%
rename from src/main/target/TMTR_TMOTORF4/target.mk
rename to src/main/target/TMOTORF4/target.mk
diff --git a/src/main/target/TMTR_TMOTORF4HD/config.c b/src/main/target/TMOTORF4HD/config.c
similarity index 100%
rename from src/main/target/TMTR_TMOTORF4HD/config.c
rename to src/main/target/TMOTORF4HD/config.c
diff --git a/src/main/target/TMTR_TMOTORF4HD/target.c b/src/main/target/TMOTORF4HD/target.c
similarity index 100%
rename from src/main/target/TMTR_TMOTORF4HD/target.c
rename to src/main/target/TMOTORF4HD/target.c
diff --git a/src/main/target/TMTR_TMOTORF4HD/target.h b/src/main/target/TMOTORF4HD/target.h
similarity index 100%
rename from src/main/target/TMTR_TMOTORF4HD/target.h
rename to src/main/target/TMOTORF4HD/target.h
diff --git a/src/main/target/TMTR_TMOTORF4HD/target.mk b/src/main/target/TMOTORF4HD/target.mk
similarity index 100%
rename from src/main/target/TMTR_TMOTORF4HD/target.mk
rename to src/main/target/TMOTORF4HD/target.mk
diff --git a/src/main/target/TMTR_TMOTORF7/target.c b/src/main/target/TMOTORF7/target.c
similarity index 100%
rename from src/main/target/TMTR_TMOTORF7/target.c
rename to src/main/target/TMOTORF7/target.c
diff --git a/src/main/target/TMTR_TMOTORF7/target.h b/src/main/target/TMOTORF7/target.h
similarity index 100%
rename from src/main/target/TMTR_TMOTORF7/target.h
rename to src/main/target/TMOTORF7/target.h
diff --git a/src/main/target/TMTR_TMOTORF7/target.mk b/src/main/target/TMOTORF7/target.mk
similarity index 100%
rename from src/main/target/TMTR_TMOTORF7/target.mk
rename to src/main/target/TMOTORF7/target.mk
diff --git a/src/main/target/TMTR_TMPACERF7/target.c b/src/main/target/TMPACERF7/target.c
similarity index 100%
rename from src/main/target/TMTR_TMPACERF7/target.c
rename to src/main/target/TMPACERF7/target.c
diff --git a/src/main/target/TMTR_TMPACERF7/target.h b/src/main/target/TMPACERF7/target.h
similarity index 100%
rename from src/main/target/TMTR_TMPACERF7/target.h
rename to src/main/target/TMPACERF7/target.h
diff --git a/src/main/target/TMTR_TMPACERF7/target.mk b/src/main/target/TMPACERF7/target.mk
similarity index 100%
rename from src/main/target/TMTR_TMPACERF7/target.mk
rename to src/main/target/TMPACERF7/target.mk
diff --git a/src/main/target/TMTR_TMVELOX/config.c b/src/main/target/TMVELOX/config.c
similarity index 100%
rename from src/main/target/TMTR_TMVELOX/config.c
rename to src/main/target/TMVELOX/config.c
diff --git a/src/main/target/TMTR_TMVELOX/target.c b/src/main/target/TMVELOX/target.c
similarity index 100%
rename from src/main/target/TMTR_TMVELOX/target.c
rename to src/main/target/TMVELOX/target.c
diff --git a/src/main/target/TMTR_TMVELOX/target.h b/src/main/target/TMVELOX/target.h
similarity index 100%
rename from src/main/target/TMTR_TMVELOX/target.h
rename to src/main/target/TMVELOX/target.h
diff --git a/src/main/target/TMTR_TMVELOX/target.mk b/src/main/target/TMVELOX/target.mk
similarity index 100%
rename from src/main/target/TMTR_TMVELOX/target.mk
rename to src/main/target/TMVELOX/target.mk