diff --git a/CI/build/conf/cores_config.json b/CI/build/conf/cores_config.json
index 1b3bab337b..780991c1be 100644
--- a/CI/build/conf/cores_config.json
+++ b/CI/build/conf/cores_config.json
@@ -56,10 +56,10 @@
             "ARMED_V1",
             "BLUE_F407VE_Mini",
             "BLACKPILL_F103C8",
-            "BLACKPILL_F103C8B",
+            "BLACKPILL_F103CB",
             "BLUEPILL_F103C6",
             "BLUEPILL_F103C8",
-            "BLUEPILL_F103C8B",
+            "BLUEPILL_F103CB",
             "BLACKPILL_F303CC",
             "BLACKPILL_F401CC",
             "CoreBoard_F401RC",
@@ -155,10 +155,10 @@
             "AFROFLIGHT_F103CB_12M",
             "ARMED_V1",
             "BLACKPILL_F103C8",
-            "BLACKPILL_F103C8B",
+            "BLACKPILL_F103CB",
             "BLUEPILL_F103C6",
             "BLUEPILL_F103C8",
-            "BLUEPILL_F103C8B",
+            "BLUEPILL_F103CB",
             "BLACKPILL_F303CC",
             "BLACKPILL_F401CC",
             "BLUE_F407VE_Mini",
diff --git a/CI/build/conf/cores_config_ci.json b/CI/build/conf/cores_config_ci.json
index 23a436db43..1aec0925d7 100644
--- a/CI/build/conf/cores_config_ci.json
+++ b/CI/build/conf/cores_config_ci.json
@@ -27,12 +27,12 @@
           "applicable": false,
           "boards": [
             "AFROFLIGHT_F103CB_12M",
-            "BLACKPILL_F103C8B",
+            "BLACKPILL_F103CB",
             "BLACK_F407VG",
             "BLACK_F407ZE",
             "BLACK_F407ZG",
             "BLUEPILL_F103C6",
-            "BLUEPILL_F103C8B",
+            "BLUEPILL_F103CB",
             "DEMO_F030F4_16M",
             "Generic_F103R8T6",
             "Generic_F103RBT6",
diff --git a/CI/build/conf/cores_config_travis.json b/CI/build/conf/cores_config_travis.json
index ae87b824af..d1f35d6f9c 100644
--- a/CI/build/conf/cores_config_travis.json
+++ b/CI/build/conf/cores_config_travis.json
@@ -23,12 +23,12 @@
           "applicable": false,
           "boards": [
             "AFROFLIGHT_F103CB_12M",
-            "BLACKPILL_F103C8B",
+            "BLACKPILL_F103CB",
             "BLACK_F407VG",
             "BLACK_F407ZE",
             "BLACK_F407ZG",
             "BLUEPILL_F103C6",
-            "BLUEPILL_F103C8B",
+            "BLUEPILL_F103CB",
             "DEMO_F030F4_16M",
             "Generic_F103R8T6",
             "Generic_F103RBT6",
diff --git a/boards.txt b/boards.txt
index 06e14f50be..33b223fe1e 100644
--- a/boards.txt
+++ b/boards.txt
@@ -851,12 +851,12 @@ GenF1.menu.pnum.BLUEPILL_F103C8.build.board=BLUEPILL_F103C8
 GenF1.menu.pnum.BLUEPILL_F103C8.build.product_line=STM32F103xB
 GenF1.menu.pnum.BLUEPILL_F103C8.build.variant=PILL_F103XX
 
-GenF1.menu.pnum.BLUEPILL_F103C8B=BluePill F103C8 (128k)
-GenF1.menu.pnum.BLUEPILL_F103C8B.upload.maximum_size=131072
-GenF1.menu.pnum.BLUEPILL_F103C8B.upload.maximum_data_size=20480
-GenF1.menu.pnum.BLUEPILL_F103C8B.build.board=BLUEPILL_F103C8
-GenF1.menu.pnum.BLUEPILL_F103C8B.build.product_line=STM32F103xB
-GenF1.menu.pnum.BLUEPILL_F103C8B.build.variant=PILL_F103XX
+GenF1.menu.pnum.BLUEPILL_F103CB=BluePill F103CB (or C8 with 128k)
+GenF1.menu.pnum.BLUEPILL_F103CB.upload.maximum_size=131072
+GenF1.menu.pnum.BLUEPILL_F103CB.upload.maximum_data_size=20480
+GenF1.menu.pnum.BLUEPILL_F103CB.build.board=BLUEPILL_F103CB
+GenF1.menu.pnum.BLUEPILL_F103CB.build.product_line=STM32F103xB
+GenF1.menu.pnum.BLUEPILL_F103CB.build.variant=PILL_F103XX
 
 # BLACKPILL_F103C8 board
 GenF1.menu.pnum.BLACKPILL_F103C8=BlackPill F103C8
@@ -866,12 +866,12 @@ GenF1.menu.pnum.BLACKPILL_F103C8.build.board=BLACKPILL_F103C8
 GenF1.menu.pnum.BLACKPILL_F103C8.build.product_line=STM32F103xB
 GenF1.menu.pnum.BLACKPILL_F103C8.build.variant=PILL_F103XX
 
-GenF1.menu.pnum.BLACKPILL_F103C8B=BlackPill F103C8 (128k)
-GenF1.menu.pnum.BLACKPILL_F103C8B.upload.maximum_size=131072
-GenF1.menu.pnum.BLACKPILL_F103C8B.upload.maximum_data_size=20480
-GenF1.menu.pnum.BLACKPILL_F103C8B.build.board=BLACKPILL_F103C8
-GenF1.menu.pnum.BLACKPILL_F103C8B.build.product_line=STM32F103xB
-GenF1.menu.pnum.BLACKPILL_F103C8B.build.variant=PILL_F103XX
+GenF1.menu.pnum.BLACKPILL_F103CB=BlackPill F103CB (or C8 with 128k)
+GenF1.menu.pnum.BLACKPILL_F103CB.upload.maximum_size=131072
+GenF1.menu.pnum.BLACKPILL_F103CB.upload.maximum_data_size=20480
+GenF1.menu.pnum.BLACKPILL_F103CB.build.board=BLACKPILL_F103CB
+GenF1.menu.pnum.BLACKPILL_F103CB.build.product_line=STM32F103xB
+GenF1.menu.pnum.BLACKPILL_F103CB.build.variant=PILL_F103XX
 
 # Generic STM32F103Rx boards (Blue button)
 GenF1.menu.pnum.Generic_F103R8T6=Generic F103R8T6 (Blue Button)
diff --git a/variants/PILL_F103XX/variant.h b/variants/PILL_F103XX/variant.h
index 2b452f73a6..2f7d5dfb5f 100644
--- a/variants/PILL_F103XX/variant.h
+++ b/variants/PILL_F103XX/variant.h
@@ -85,11 +85,15 @@ extern "C" {
 #define NUM_ANALOG_FIRST        20
 
 // On-board LED pin number
-#ifdef ARDUINO_BLUEPILL_F103C8
+#if defined(ARDUINO_BLUEPILL_F103C6) || defined(ARDUINO_BLUEPILL_F103C8) ||\
+    defined(ARDUINO_BLUEPILL_F103CB)
 #define LED_BUILTIN             PC13
 #else
+#ifndef LED_BUILTIN
+// Default for Blackpill
 #define LED_BUILTIN             PB12
 #endif
+#endif
 #define LED_GREEN               LED_BUILTIN
 
 // SPI Definitions