diff --git a/hal/targets.json b/hal/targets.json
index 7f7fb49a58..22a47560df 100644
--- a/hal/targets.json
+++ b/hal/targets.json
@@ -1685,7 +1685,6 @@
         "default_build": "standard"
     },
     "GENERIC_F103C8": {
-        "supported_form_factors": ["ARDUINO"],
         "core": "Cortex-M3",
         "default_toolchain": "GCC_ARM",
         "extra_labels": ["STM", "STM32F1", "STM32F103C8"],
diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F1/TARGET_GENERIC_F103C8/PinNames.h b/hal/targets/hal/TARGET_STM/TARGET_STM32F1/TARGET_GENERIC_F103C8/PinNames.h
index a697175e7c..ead3ad58ec 100644
--- a/hal/targets/hal/TARGET_STM/TARGET_STM32F1/TARGET_GENERIC_F103C8/PinNames.h
+++ b/hal/targets/hal/TARGET_STM/TARGET_STM32F1/TARGET_GENERIC_F103C8/PinNames.h
@@ -119,29 +119,42 @@ typedef enum {
 
     PD_2  = 0x32,
 
-    // Arduino connector namings
+    // PCB printout
     A0          = PA_0,
     A1          = PA_1,
-    A2          = PA_4,
-    A3          = PB_0,
-    A4          = PC_1,
-    A5          = PC_0,
-    D0          = PA_3,
-    D1          = PA_2,
-    D2          = PA_10,
-    D3          = PB_3,
-    D4          = PB_5,
-    D5          = PB_4,
-    D6          = PB_10,
-    D7          = PA_8,
-    D8          = PA_9,
-    D9          = PC_7,
-    D10         = PB_6,
-    D11         = PA_7,
-    D12         = PA_6,
-    D13         = PA_5,
-    D14         = PB_9,
-    D15         = PB_8,
+    A2          = PA_2,
+    A3          = PA_3,
+    A4          = PA_4,
+    A5          = PA_5,
+    A6          = PA_6,
+    A7          = PA_7,
+    A8          = PA_8,
+    A9          = PA_9,
+    A10         = PA_10,
+    A11         = PA_11,
+    A12         = PA_12,
+    A15         = PA_15,
+
+    B0          = PB_0,
+    B1          = PB_1,
+    B2          = PB_2,
+    B3          = PB_3,
+    B4          = PB_4,
+    B5          = PB_5,
+    B6          = PB_6,
+    B7          = PB_7,
+    B8          = PB_8,
+    B9          = PB_9,
+    B10         = PB_10,
+    B11         = PB_11,
+    B12         = PB_12,
+    B13         = PB_13,
+    B14         = PB_14,
+    B15         = PB_15,
+
+    C13         = PC_13,
+    C14         = PC_14,
+    C15         = PC_15,
 
     // Generic signals namings
     LED1        = PC_13,