diff --git a/targets/targets.json b/targets/targets.json
index 56d54cc798..5cf6b5c09f 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -1766,7 +1766,7 @@
         "detect_code": [
             "0720"
         ],
-        "device_name": "STM32F401RE"
+        "device_name": "STM32F401RETx"
     },
     "MCU_STM32F407xE": {
         "inherits": [
@@ -1835,7 +1835,7 @@
         "detect_code": [
             "0740"
         ],
-        "device_name": "STM32F411RE"
+        "device_name": "STM32F411RETx"
     },
     "MTS_DRAGONFLY_F411RE": {
         "inherits": [
@@ -1851,7 +1851,7 @@
             "SERIAL_FC",
             "LPTICKER"
         ],
-        "device_name": "STM32F411RE",
+        "device_name": "STM32F411RETx",
         "detect_code": [
             "0454"
         ]
@@ -1873,7 +1873,7 @@
             "FLASH",
             "SERIAL_FC"
         ],
-        "device_name": "STM32F411RE",
+        "device_name": "STM32F411RETx",
         "detect_code": [
             "0320"
         ]
@@ -1908,7 +1908,7 @@
         "device_has_add": [
             "USBDEVICE"
         ],
-        "device_name": "STM32F412ZG"
+        "device_name": "STM32F412ZGTx"
     },
     "WIO_EMW3166": {
         "inherits": [
@@ -1918,7 +1918,7 @@
             "WICED",
             "CYW43362"
         ],
-        "device_name": "STM32F412ZG",
+        "device_name": "STM32F412ZGTx",
         "overrides": {
             "clock_source": "USE_PLL_HSI",
             "network-default-interface-type": "WIFI"
@@ -2000,7 +2000,7 @@
             "QSPI",
             "USBDEVICE"
         ],
-        "device_name": "STM32F413ZH"
+        "device_name": "STM32F413ZHTx"
     },
     "NUCLEO_F413ZH": {
         "inherits": [
@@ -2015,7 +2015,7 @@
         "device_has_add": [
             "USBDEVICE"
         ],
-        "device_name": "STM32F413ZH"
+        "device_name": "STM32F413ZHTx"
     },
     "MCU_STM32F429xI": {
         "inherits": [
@@ -2065,7 +2065,7 @@
         "detect_code": [
             "0796"
         ],
-        "device_name": "STM32F429ZI",
+        "device_name": "STM32F429ZITx",
         "overrides": {
             "network-default-interface-type": "ETHERNET"
         }
@@ -2086,7 +2086,7 @@
         "device_has_remove": [
             "LPTICKER"
         ],
-        "device_name": "STM32F429ZI",
+        "device_name": "STM32F429ZITx",
         "detect_code": [
             "0795"
         ]
@@ -2127,7 +2127,7 @@
         "detect_code": [
             "9014"
         ],
-        "device_name": "STM32F439VI"
+        "device_name": "STM32F439VITx"
     },
     "WIO_BG96": {
         "inherits": [
@@ -2150,7 +2150,7 @@
         "detect_code": [
             "9015"
         ],
-        "device_name": "STM32F439VI",
+        "device_name": "STM32F439VITx",
         "components_add": [
             "SD"
         ]
@@ -2180,7 +2180,7 @@
         "detect_code": [
             "0797"
         ],
-        "device_name": "STM32F439ZI",
+        "device_name": "STM32F439ZITx",
         "overrides": {
             "network-default-interface-type": "ETHERNET"
         }
@@ -2212,7 +2212,7 @@
         "detect_code": [
             "0777"
         ],
-        "device_name": "STM32F446RE"
+        "device_name": "STM32F446RETx"
     },
     "NUCLEO_F446ZE": {
         "inherits": [
@@ -2234,7 +2234,7 @@
         "device_has_add": [
             "USBDEVICE"
         ],
-        "device_name": "STM32F446ZE"
+        "device_name": "STM32F446ZETx"
     },
     "MCU_STM32F469xI": {
         "inherits": [
@@ -2276,7 +2276,7 @@
             "QSPI",
             "USBDEVICE"
         ],
-        "device_name": "STM32F469NI"
+        "device_name": "STM32F469NIHx"
     },
     "SDP_K1": {
         "inherits": [
@@ -2307,7 +2307,7 @@
         "device_has_remove": [
             "LPTICKER"
         ],
-        "device_name": "STM32F469NI",
+        "device_name": "STM32F469NIHx",
         "detect_code": [
             "0604"
         ]
diff --git a/tools/arm_pack_manager/aliases.json b/tools/arm_pack_manager/aliases.json
index 8733b5fdf3..190a9d39a1 100644
--- a/tools/arm_pack_manager/aliases.json
+++ b/tools/arm_pack_manager/aliases.json
@@ -1,10 +1,4 @@
 {
-  "32F469IDISCOVERY": {
-    "name": "32F469IDISCOVERY",
-    "mounted_devices": [
-      "STM32F469NI"
-    ]
-  },
   "A31G112 MINI B/D": {
     "name": "A31G112 MINI B/D",
     "mounted_devices": [
@@ -516,12 +510,6 @@
       "MCIMX7D7"
     ]
   },
-  "Koala EVM": {
-    "name": "Koala EVM",
-    "mounted_devices": [
-      "STM32F429II"
-    ]
-  },
   "LPC1788-32 Developers Kit": {
     "name": "LPC1788-32 Developers Kit",
     "mounted_devices": [
@@ -771,12 +759,6 @@
       "NUC140VE3AN"
     ]
   },
-  "MCBSTM32F400": {
-    "name": "MCBSTM32F400",
-    "mounted_devices": [
-      "STM32F407IG"
-    ]
-  },
   "MCBTMPM330": {
     "name": "MCBTMPM330",
     "mounted_devices": [
@@ -926,18 +908,6 @@
       "nRF51422_xxAA"
     ]
   },
-  "NUCLEO-F401RE": {
-    "name": "NUCLEO-F401RE",
-    "mounted_devices": [
-      "STM32F401RE"
-    ]
-  },
-  "NUCLEO-F446RE": {
-    "name": "NUCLEO-F446RE",
-    "mounted_devices": [
-      "STM32F446RE"
-    ]
-  },
   "NUCLEO-L152RE": {
     "name": "NUCLEO-L152RE",
     "mounted_devices": [
@@ -962,12 +932,6 @@
       "M2351KIAAE"
     ]
   },
-  "OLIMEX-STM32E407": {
-    "name": "OLIMEX-STM32E407",
-    "mounted_devices": [
-      "STM32F407ZG"
-    ]
-  },
   "PAC52XX EVK": {
     "name": "PAC52XX EVK",
     "mounted_devices": [
@@ -1222,12 +1186,6 @@
       "STM32F756NGHx"
     ]
   },
-  "STM32F429I-Discovery": {
-    "name": "STM32F429I-Discovery",
-    "mounted_devices": [
-      "STM32F429ZI"
-    ]
-  },
   "STM32F7-SOM": {
     "name": "STM32F7-SOM",
     "mounted_devices": [
diff --git a/tools/arm_pack_manager/legacy-names.json b/tools/arm_pack_manager/legacy-names.json
index 9d1b16970d..8c775371c8 100644
--- a/tools/arm_pack_manager/legacy-names.json
+++ b/tools/arm_pack_manager/legacy-names.json
@@ -7,24 +7,6 @@
     "MKL46Z256xxx4": "MKL46Z256VLL4",
     "MKL82Z128xxx7": "MKL82Z128VLK7",
     "R7S72103": "R7S72100",
-    "STM32F401RE": "STM32F401RETx",
-    "STM32F401VC": "STM32F401VCTx",
-    "STM32F401VE": "STM32F401VETx",
-    "STM32F405RG": "STM32F405RGTx",
-    "STM32F407VG": "STM32F407VGTx",
-    "STM32F407ZG": "STM32F407ZGTx",
-    "STM32F410RB": "STM32F410RBTx",
-    "STM32F411RE": "STM32F411RETx",
-    "STM32F412ZG": "STM32F412ZGTx",
-    "STM32F413ZH": "STM32F413ZHTx",
-    "STM32F429ZI": "STM32F429ZITx",
-    "STM32F437VG": "STM32F437VGTx",
-    "STM32F439VI": "STM32F439VITx",
-    "STM32F439ZI": "STM32F439ZITx",
-    "STM32F446RE": "STM32F446RETx",
-    "STM32F446VE": "STM32F446VETx",
-    "STM32F446ZE": "STM32F446ZETx",
-    "STM32F469NI": "STM32F469NIHx",
     "STM32F746NG": "STM32F746NGHx",
     "STM32F746ZG": "STM32F746ZGTx",
     "STM32F756ZG": "STM32F756ZGTx",