diff --git a/features/netsocket/emac-drivers/TARGET_STM_EMAC/TARGET_STM32F4/TARGET_OLIMEX_STM32E407_F407ZG/stm32f4_eth_conf.c b/features/netsocket/emac-drivers/TARGET_STM/TARGET_STM32F4/TARGET_OLIMEX_STM32E407_F407ZG/stm32f4_eth_conf.c
similarity index 100%
rename from features/netsocket/emac-drivers/TARGET_STM_EMAC/TARGET_STM32F4/TARGET_OLIMEX_STM32E407_F407ZG/stm32f4_eth_conf.c
rename to features/netsocket/emac-drivers/TARGET_STM/TARGET_STM32F4/TARGET_OLIMEX_STM32E407_F407ZG/stm32f4_eth_conf.c
diff --git a/features/netsocket/emac-drivers/TARGET_STM_EMAC/TARGET_STM32F4/TARGET_OLIMEX_STM32E407_F407ZG/stm32f4_eth_init.c b/features/netsocket/emac-drivers/TARGET_STM/TARGET_STM32F4/TARGET_OLIMEX_STM32E407_F407ZG/stm32f4_eth_init.c
similarity index 100%
rename from features/netsocket/emac-drivers/TARGET_STM_EMAC/TARGET_STM32F4/TARGET_OLIMEX_STM32E407_F407ZG/stm32f4_eth_init.c
rename to features/netsocket/emac-drivers/TARGET_STM/TARGET_STM32F4/TARGET_OLIMEX_STM32E407_F407ZG/stm32f4_eth_init.c
diff --git a/targets/TARGET_STM/mbed_rtx.h b/targets/TARGET_STM/mbed_rtx.h
index af69f57041..b33c5cf499 100644
--- a/targets/TARGET_STM/mbed_rtx.h
+++ b/targets/TARGET_STM/mbed_rtx.h
@@ -93,9 +93,8 @@
 
 #elif (defined(TARGET_STM32F207ZG) ||\
        defined(TARGET_STM32F405RG) ||\
-       defined(TARGET_STM32F407VG) ||\
+       defined(TARGET_STM32F407xG) ||\
        defined(TARGET_STM32F407VE) ||\
-       defined(TARGET_STM32F407ZG) ||\
        defined(TARGET_STM32F411RE) ||\
        defined(TARGET_STM32F446RE) ||\
        defined(TARGET_STM32F446VE) ||\
diff --git a/targets/targets.json b/targets/targets.json
index 9d092da605..803681d189 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -4030,11 +4030,8 @@
         "core": "Cortex-M4F",
         "extra_labels_add": [
             "STM32F4",
-            "STM32F407",
-            "STM32F407xG",
-            "STM32F407VG"
+            "STM32F407xG"
         ],
-        "supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
         "config": {
             "clock_source": {
                 "help": "Mask value : USE_PLL_HSE_EXTC (need HW patch) | USE_PLL_HSE_XTAL | USE_PLL_HSI",
@@ -4056,12 +4053,8 @@
         "core": "Cortex-M4F",
         "extra_labels_add": [
             "STM32F4",
-            "STM32F407",
-            "STM32F407xG",
-            "STM32F407ZG",
-            "STM_EMAC"
+            "STM32F407xG"
         ],
-        "supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
         "config": {
             "clock_source": {
                 "help": "Mask value : USE_PLL_HSE_EXTC (need HW patch) | USE_PLL_HSE_XTAL | USE_PLL_HSI",
@@ -4073,7 +4066,6 @@
                 "value": "12000000"
             }
         },
-        "macros_add": ["USB_STM_HAL"],
         "overrides": { "lse_available": 0 },
         "device_has_add": [
             "ANALOGOUT",