diff --git a/targets/targets.json b/targets/targets.json
index 90bca22eb9..dc83c51c6e 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -1357,8 +1357,7 @@
             "MCU_STM32F070xB"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0755"
@@ -1386,8 +1385,7 @@
             "MCU_STM32F072xB"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0730"
@@ -1415,8 +1413,7 @@
             "MCU_STM32F091xC"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0750"
@@ -1478,8 +1475,7 @@
             "MCU_STM32F103xB"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0700"
@@ -1563,8 +1559,7 @@
             "MCU_STM32F207xZ"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "config": {
             "d11_configuration": {
@@ -1693,8 +1688,7 @@
             "MCU_STM32F303xE"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0745"
@@ -1706,8 +1700,7 @@
             "MCU_STM32F303xE"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0747"
@@ -1772,8 +1765,7 @@
             "MCU_STM32F401xE"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0720"
@@ -1801,7 +1793,7 @@
             "MCU_STM32F407xE"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "program_cycle_s": 2,
         "components_add": [
@@ -1841,8 +1833,7 @@
             "MCU_STM32F411xE"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0740"
@@ -1853,6 +1844,9 @@
         "inherits": [
             "MCU_STM32F411xE"
         ],
+        "supported_form_factors": [
+            "ARDUINO_UNO"
+        ],
         "overrides": {
             "lse_available": 0
         },
@@ -1911,8 +1905,7 @@
             "MCU_STM32F412xG"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0826"
@@ -1970,6 +1963,9 @@
         "inherits": [
             "MCU_STM32F413xH"
         ],
+        "supported_form_factors": [
+            "ARDUINO_UNO"
+        ],
         "config": {
             "hse_value": {
                 "help": "HSE via 26MHz xtal",
@@ -2000,7 +1996,7 @@
             "QSPIF"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "extra_labels_add": [
             "N25Q128A"
@@ -2019,7 +2015,7 @@
             "MCU_STM32F413xH"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0743"
@@ -2051,7 +2047,7 @@
             "MCU_STM32F429xI"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "config": {
             "d11_configuration": {
@@ -2172,7 +2168,7 @@
             "MCU_STM32F439xI"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "config": {
             "d11_configuration": {
@@ -2218,8 +2214,7 @@
             "MCU_STM32F446xE"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0777"
@@ -2231,8 +2226,7 @@
             "MCU_STM32F446xE"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "config": {
             "usb_speed": {
@@ -2273,7 +2267,7 @@
             "QSPIF"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "extra_labels_add": [
             "N25Q128A"
@@ -2295,7 +2289,7 @@
             "MCU_STM32F469xI"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "config": {
             "clock_freq": {
@@ -2381,7 +2375,7 @@
             "QSPIF"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "config": {
             "usb_speed": {
@@ -2426,7 +2420,7 @@
             "STM32F746xx"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0816"
@@ -2460,7 +2454,7 @@
             "MBEDTLS_CONFIG_HW_SUPPORT"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0819"
@@ -2522,7 +2516,7 @@
             }
         },
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "macros_add": [
             "STM32F767xx"
@@ -2551,7 +2545,7 @@
             "QSPIF"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "config": {
             "flash_dual_bank": {
@@ -2684,8 +2678,7 @@
             "MCU_STM32G071xx"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "config": {
             "hse_value": {
@@ -2839,8 +2832,7 @@
             "MCU_STM32G474xE"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "overrides": {
             "hse_value": 24000000
@@ -3350,8 +3342,7 @@
             "MCU_STM32L072xZ"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO_PART"
         ],
         "components_add": [
             "SX1276"
@@ -3382,8 +3373,7 @@
             "MCU_STM32L073xZ"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0760"
@@ -3490,7 +3480,7 @@
             "MCU_STM32L152xC"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "extra_labels_add": [
             "STM32L152RC"
@@ -3520,8 +3510,7 @@
             "MCU_STM32L152xE"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0710"
@@ -4217,8 +4206,7 @@
             "MCU_STM32WB55xx"
         ],
         "supported_form_factors": [
-            "ARDUINO",
-            "MORPHO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0839"
@@ -4281,7 +4269,7 @@
             "MCU_STM32WL55xC"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "detect_code": [
             "0866"