diff --git a/stm32f103c8t6-bootloader/build_number.txt b/stm32f103c8t6-bootloader/build_number.txt
deleted file mode 100644
index c8eb588..0000000
--- a/stm32f103c8t6-bootloader/build_number.txt
+++ /dev/null
@@ -1 +0,0 @@
-438
diff --git a/stm32f103c8t6/build_number.txt b/stm32f103c8t6/build_number.txt
deleted file mode 100644
index 3ae0b93..0000000
--- a/stm32f103c8t6/build_number.txt
+++ /dev/null
@@ -1 +0,0 @@
-321
diff --git a/stm32f103c8t6-bootloader/.gitignore b/stm32f103t8u6-bootloader/.gitignore
similarity index 100%
rename from stm32f103c8t6-bootloader/.gitignore
rename to stm32f103t8u6-bootloader/.gitignore
diff --git a/stm32f103c8t6-bootloader/LICENCE_ISC.md b/stm32f103t8u6-bootloader/LICENCE_ISC.md
similarity index 100%
rename from stm32f103c8t6-bootloader/LICENCE_ISC.md
rename to stm32f103t8u6-bootloader/LICENCE_ISC.md
diff --git a/stm32f103c8t6-bootloader/README.md b/stm32f103t8u6-bootloader/README.md
similarity index 100%
rename from stm32f103c8t6-bootloader/README.md
rename to stm32f103t8u6-bootloader/README.md
diff --git a/stm32f103t8u6-bootloader/build_number.txt b/stm32f103t8u6-bootloader/build_number.txt
new file mode 100644
index 0000000..99dea3b
--- /dev/null
+++ b/stm32f103t8u6-bootloader/build_number.txt
@@ -0,0 +1 @@
+439
diff --git a/stm32f103c8t6-bootloader/compile_flags.txt b/stm32f103t8u6-bootloader/compile_flags.txt
similarity index 100%
rename from stm32f103c8t6-bootloader/compile_flags.txt
rename to stm32f103t8u6-bootloader/compile_flags.txt
diff --git a/stm32f103c8t6-bootloader/ld/common.ld b/stm32f103t8u6-bootloader/ld/common.ld
similarity index 100%
rename from stm32f103c8t6-bootloader/ld/common.ld
rename to stm32f103t8u6-bootloader/ld/common.ld
diff --git a/stm32f103c8t6-bootloader/ld/stm32f103c8t6_flash.ld b/stm32f103t8u6-bootloader/ld/stm32f103t8u6_flash.ld
similarity index 100%
rename from stm32f103c8t6-bootloader/ld/stm32f103c8t6_flash.ld
rename to stm32f103t8u6-bootloader/ld/stm32f103t8u6_flash.ld
diff --git a/stm32f103c8t6-bootloader/makefile b/stm32f103t8u6-bootloader/makefile
similarity index 99%
rename from stm32f103c8t6-bootloader/makefile
rename to stm32f103t8u6-bootloader/makefile
index 2c1615b..a8eaea8 100644
--- a/stm32f103c8t6-bootloader/makefile
+++ b/stm32f103t8u6-bootloader/makefile
@@ -10,7 +10,7 @@ DEBUG := yes
 H_DEVICE = STM32F030x6
 STARTUP_SOURCE_DIR = src
 STARTUP_SOURCES = $(STARTUP_SOURCE_DIR)/startup.S
-LD_SCRIPT = ld/stm32f103c8t6_flash.ld
+LD_SCRIPT = ld/stm32f103t8u6_flash.ld
 
 ifeq ($(DEBUG),yes)
 DEBUG_FLAGS = -DDEBUG -g3
diff --git a/stm32f103c8t6-bootloader/src/buildinfo.h b/stm32f103t8u6-bootloader/src/buildinfo.h
similarity index 100%
rename from stm32f103c8t6-bootloader/src/buildinfo.h
rename to stm32f103t8u6-bootloader/src/buildinfo.h
diff --git a/stm32f103c8t6-bootloader/src/commands.h b/stm32f103t8u6-bootloader/src/commands.h
similarity index 100%
rename from stm32f103c8t6-bootloader/src/commands.h
rename to stm32f103t8u6-bootloader/src/commands.h
diff --git a/stm32f103c8t6-bootloader/src/flash.c b/stm32f103t8u6-bootloader/src/flash.c
similarity index 100%
rename from stm32f103c8t6-bootloader/src/flash.c
rename to stm32f103t8u6-bootloader/src/flash.c
diff --git a/stm32f103c8t6-bootloader/src/flash.h b/stm32f103t8u6-bootloader/src/flash.h
similarity index 100%
rename from stm32f103c8t6-bootloader/src/flash.h
rename to stm32f103t8u6-bootloader/src/flash.h
diff --git a/stm32f103c8t6-bootloader/src/main.c b/stm32f103t8u6-bootloader/src/main.c
similarity index 100%
rename from stm32f103c8t6-bootloader/src/main.c
rename to stm32f103t8u6-bootloader/src/main.c
diff --git a/stm32f103c8t6-bootloader/src/main.h b/stm32f103t8u6-bootloader/src/main.h
similarity index 100%
rename from stm32f103c8t6-bootloader/src/main.h
rename to stm32f103t8u6-bootloader/src/main.h
diff --git a/stm32f103c8t6-bootloader/src/ownership.h b/stm32f103t8u6-bootloader/src/ownership.h
similarity index 100%
rename from stm32f103c8t6-bootloader/src/ownership.h
rename to stm32f103t8u6-bootloader/src/ownership.h
diff --git a/stm32f103c8t6-bootloader/src/pinning.h b/stm32f103t8u6-bootloader/src/pinning.h
similarity index 100%
rename from stm32f103c8t6-bootloader/src/pinning.h
rename to stm32f103t8u6-bootloader/src/pinning.h
diff --git a/stm32f103c8t6-bootloader/src/startup.S b/stm32f103t8u6-bootloader/src/startup.S
similarity index 100%
rename from stm32f103c8t6-bootloader/src/startup.S
rename to stm32f103t8u6-bootloader/src/startup.S
diff --git a/stm32f103c8t6-bootloader/src/usb.c b/stm32f103t8u6-bootloader/src/usb.c
similarity index 100%
rename from stm32f103c8t6-bootloader/src/usb.c
rename to stm32f103t8u6-bootloader/src/usb.c
diff --git a/stm32f103c8t6-bootloader/src/usb.h b/stm32f103t8u6-bootloader/src/usb.h
similarity index 100%
rename from stm32f103c8t6-bootloader/src/usb.h
rename to stm32f103t8u6-bootloader/src/usb.h
diff --git a/stm32f103c8t6-bootloader/src/usb_com.c b/stm32f103t8u6-bootloader/src/usb_com.c
similarity index 100%
rename from stm32f103c8t6-bootloader/src/usb_com.c
rename to stm32f103t8u6-bootloader/src/usb_com.c
diff --git a/stm32f103c8t6-bootloader/src/usb_com.h b/stm32f103t8u6-bootloader/src/usb_com.h
similarity index 100%
rename from stm32f103c8t6-bootloader/src/usb_com.h
rename to stm32f103t8u6-bootloader/src/usb_com.h
diff --git a/stm32f103c8t6-bootloader/src/usb_descriptors.c b/stm32f103t8u6-bootloader/src/usb_descriptors.c
similarity index 100%
rename from stm32f103c8t6-bootloader/src/usb_descriptors.c
rename to stm32f103t8u6-bootloader/src/usb_descriptors.c
diff --git a/stm32f103c8t6-bootloader/src/usb_descriptors.h b/stm32f103t8u6-bootloader/src/usb_descriptors.h
similarity index 100%
rename from stm32f103c8t6-bootloader/src/usb_descriptors.h
rename to stm32f103t8u6-bootloader/src/usb_descriptors.h
diff --git a/stm32f103c8t6-bootloader/src/usb_util.c b/stm32f103t8u6-bootloader/src/usb_util.c
similarity index 100%
rename from stm32f103c8t6-bootloader/src/usb_util.c
rename to stm32f103t8u6-bootloader/src/usb_util.c
diff --git a/stm32f103c8t6-bootloader/src/usb_util.h b/stm32f103t8u6-bootloader/src/usb_util.h
similarity index 100%
rename from stm32f103c8t6-bootloader/src/usb_util.h
rename to stm32f103t8u6-bootloader/src/usb_util.h
diff --git a/stm32f103c8t6-bootloader/src/util.c b/stm32f103t8u6-bootloader/src/util.c
similarity index 100%
rename from stm32f103c8t6-bootloader/src/util.c
rename to stm32f103t8u6-bootloader/src/util.c
diff --git a/stm32f103c8t6-bootloader/src/util.h b/stm32f103t8u6-bootloader/src/util.h
similarity index 100%
rename from stm32f103c8t6-bootloader/src/util.h
rename to stm32f103t8u6-bootloader/src/util.h
diff --git a/stm32f103c8t6-bootloader/third_party/core/core_cm3.h b/stm32f103t8u6-bootloader/third_party/core/core_cm3.h
similarity index 100%
rename from stm32f103c8t6-bootloader/third_party/core/core_cm3.h
rename to stm32f103t8u6-bootloader/third_party/core/core_cm3.h
diff --git a/stm32f103c8t6-bootloader/third_party/core/core_cmFunc.h b/stm32f103t8u6-bootloader/third_party/core/core_cmFunc.h
similarity index 100%
rename from stm32f103c8t6-bootloader/third_party/core/core_cmFunc.h
rename to stm32f103t8u6-bootloader/third_party/core/core_cmFunc.h
diff --git a/stm32f103c8t6-bootloader/third_party/core/core_cmInstr.h b/stm32f103t8u6-bootloader/third_party/core/core_cmInstr.h
similarity index 100%
rename from stm32f103c8t6-bootloader/third_party/core/core_cmInstr.h
rename to stm32f103t8u6-bootloader/third_party/core/core_cmInstr.h
diff --git a/stm32f103c8t6-bootloader/third_party/core/core_generic.h b/stm32f103t8u6-bootloader/third_party/core/core_generic.h
similarity index 100%
rename from stm32f103c8t6-bootloader/third_party/core/core_generic.h
rename to stm32f103t8u6-bootloader/third_party/core/core_generic.h
diff --git a/stm32f103c8t6-bootloader/third_party/device/stm32f103x6.h b/stm32f103t8u6-bootloader/third_party/device/stm32f103x6.h
similarity index 100%
rename from stm32f103c8t6-bootloader/third_party/device/stm32f103x6.h
rename to stm32f103t8u6-bootloader/third_party/device/stm32f103x6.h
diff --git a/stm32f103c8t6-bootloader/third_party/device/stm32f1xx.h b/stm32f103t8u6-bootloader/third_party/device/stm32f1xx.h
similarity index 100%
rename from stm32f103c8t6-bootloader/third_party/device/stm32f1xx.h
rename to stm32f103t8u6-bootloader/third_party/device/stm32f1xx.h
diff --git a/stm32f103c8t6-bootloader/third_party/device/system_stm32f1xx.h b/stm32f103t8u6-bootloader/third_party/device/system_stm32f1xx.h
similarity index 100%
rename from stm32f103c8t6-bootloader/third_party/device/system_stm32f1xx.h
rename to stm32f103t8u6-bootloader/third_party/device/system_stm32f1xx.h
diff --git a/stm32f103c8t6/.gitignore b/stm32f103t8u6/.gitignore
similarity index 100%
rename from stm32f103c8t6/.gitignore
rename to stm32f103t8u6/.gitignore
diff --git a/stm32f103t8u6/build_number.txt b/stm32f103t8u6/build_number.txt
new file mode 100644
index 0000000..18fdcb2
--- /dev/null
+++ b/stm32f103t8u6/build_number.txt
@@ -0,0 +1 @@
+322
diff --git a/stm32f103c8t6/compile_flags.txt b/stm32f103t8u6/compile_flags.txt
similarity index 100%
rename from stm32f103c8t6/compile_flags.txt
rename to stm32f103t8u6/compile_flags.txt
diff --git a/stm32f103c8t6/ld/common.ld b/stm32f103t8u6/ld/common.ld
similarity index 100%
rename from stm32f103c8t6/ld/common.ld
rename to stm32f103t8u6/ld/common.ld
diff --git a/stm32f103c8t6/ld/stm32f103c8t6_flash.ld b/stm32f103t8u6/ld/stm32f103t8u6_flash.ld
similarity index 100%
rename from stm32f103c8t6/ld/stm32f103c8t6_flash.ld
rename to stm32f103t8u6/ld/stm32f103t8u6_flash.ld
diff --git a/stm32f103c8t6/makefile b/stm32f103t8u6/makefile
similarity index 99%
rename from stm32f103c8t6/makefile
rename to stm32f103t8u6/makefile
index 5efe1d6..d1866e2 100644
--- a/stm32f103c8t6/makefile
+++ b/stm32f103t8u6/makefile
@@ -10,7 +10,7 @@ DEBUG := yes
 H_DEVICE = STM32F103xB
 STARTUP_SOURCE_DIR = src
 STARTUP_SOURCES = $(STARTUP_SOURCE_DIR)/startup.S
-LD_SCRIPT = ld/stm32f103c8t6_flash.ld
+LD_SCRIPT = ld/stm32f103t8u6_flash.ld
 
 ifeq ($(DEBUG),yes)
 DEBUG_FLAGS = -DDEBUG -g3
diff --git a/stm32f103c8t6/src/buildid.h b/stm32f103t8u6/src/buildid.h
similarity index 100%
rename from stm32f103c8t6/src/buildid.h
rename to stm32f103t8u6/src/buildid.h
diff --git a/stm32f103c8t6/src/clock.h b/stm32f103t8u6/src/clock.h
similarity index 100%
rename from stm32f103c8t6/src/clock.h
rename to stm32f103t8u6/src/clock.h
diff --git a/stm32f103c8t6/src/config.h b/stm32f103t8u6/src/config.h
similarity index 100%
rename from stm32f103c8t6/src/config.h
rename to stm32f103t8u6/src/config.h
diff --git a/stm32f103c8t6/src/debug.c b/stm32f103t8u6/src/debug.c
similarity index 100%
rename from stm32f103c8t6/src/debug.c
rename to stm32f103t8u6/src/debug.c
diff --git a/stm32f103c8t6/src/debug.h b/stm32f103t8u6/src/debug.h
similarity index 100%
rename from stm32f103c8t6/src/debug.h
rename to stm32f103t8u6/src/debug.h
diff --git a/stm32f103c8t6/src/hgpl.c b/stm32f103t8u6/src/hgpl.c
similarity index 100%
rename from stm32f103c8t6/src/hgpl.c
rename to stm32f103t8u6/src/hgpl.c
diff --git a/stm32f103c8t6/src/hpgl.h b/stm32f103t8u6/src/hpgl.h
similarity index 100%
rename from stm32f103c8t6/src/hpgl.h
rename to stm32f103t8u6/src/hpgl.h
diff --git a/stm32f103c8t6/src/led.c b/stm32f103t8u6/src/led.c
similarity index 100%
rename from stm32f103c8t6/src/led.c
rename to stm32f103t8u6/src/led.c
diff --git a/stm32f103c8t6/src/led.h b/stm32f103t8u6/src/led.h
similarity index 100%
rename from stm32f103c8t6/src/led.h
rename to stm32f103t8u6/src/led.h
diff --git a/stm32f103c8t6/src/main.c b/stm32f103t8u6/src/main.c
similarity index 100%
rename from stm32f103c8t6/src/main.c
rename to stm32f103t8u6/src/main.c
diff --git a/stm32f103c8t6/src/main.h b/stm32f103t8u6/src/main.h
similarity index 100%
rename from stm32f103c8t6/src/main.h
rename to stm32f103t8u6/src/main.h
diff --git a/stm32f103c8t6/src/ownership.h b/stm32f103t8u6/src/ownership.h
similarity index 100%
rename from stm32f103c8t6/src/ownership.h
rename to stm32f103t8u6/src/ownership.h
diff --git a/stm32f103c8t6/src/pinning.h b/stm32f103t8u6/src/pinning.h
similarity index 100%
rename from stm32f103c8t6/src/pinning.h
rename to stm32f103t8u6/src/pinning.h
diff --git a/stm32f103c8t6/src/pwm_output.c b/stm32f103t8u6/src/pwm_output.c
similarity index 100%
rename from stm32f103c8t6/src/pwm_output.c
rename to stm32f103t8u6/src/pwm_output.c
diff --git a/stm32f103c8t6/src/pwm_output.h b/stm32f103t8u6/src/pwm_output.h
similarity index 100%
rename from stm32f103c8t6/src/pwm_output.h
rename to stm32f103t8u6/src/pwm_output.h
diff --git a/stm32f103c8t6/src/startup.S b/stm32f103t8u6/src/startup.S
similarity index 100%
rename from stm32f103c8t6/src/startup.S
rename to stm32f103t8u6/src/startup.S
diff --git a/stm32f103c8t6/src/usb.c b/stm32f103t8u6/src/usb.c
similarity index 100%
rename from stm32f103c8t6/src/usb.c
rename to stm32f103t8u6/src/usb.c
diff --git a/stm32f103c8t6/src/usb.h b/stm32f103t8u6/src/usb.h
similarity index 100%
rename from stm32f103c8t6/src/usb.h
rename to stm32f103t8u6/src/usb.h
diff --git a/stm32f103c8t6/src/usb_cdc.c b/stm32f103t8u6/src/usb_cdc.c
similarity index 100%
rename from stm32f103c8t6/src/usb_cdc.c
rename to stm32f103t8u6/src/usb_cdc.c
diff --git a/stm32f103c8t6/src/usb_cdc.h b/stm32f103t8u6/src/usb_cdc.h
similarity index 100%
rename from stm32f103c8t6/src/usb_cdc.h
rename to stm32f103t8u6/src/usb_cdc.h
diff --git a/stm32f103c8t6/src/usb_descriptors.c b/stm32f103t8u6/src/usb_descriptors.c
similarity index 100%
rename from stm32f103c8t6/src/usb_descriptors.c
rename to stm32f103t8u6/src/usb_descriptors.c
diff --git a/stm32f103c8t6/src/usb_descriptors.h b/stm32f103t8u6/src/usb_descriptors.h
similarity index 100%
rename from stm32f103c8t6/src/usb_descriptors.h
rename to stm32f103t8u6/src/usb_descriptors.h
diff --git a/stm32f103c8t6/src/usb_util.c b/stm32f103t8u6/src/usb_util.c
similarity index 100%
rename from stm32f103c8t6/src/usb_util.c
rename to stm32f103t8u6/src/usb_util.c
diff --git a/stm32f103c8t6/src/usb_util.h b/stm32f103t8u6/src/usb_util.h
similarity index 100%
rename from stm32f103c8t6/src/usb_util.h
rename to stm32f103t8u6/src/usb_util.h
diff --git a/stm32f103c8t6/src/usb_vendor.c b/stm32f103t8u6/src/usb_vendor.c
similarity index 100%
rename from stm32f103c8t6/src/usb_vendor.c
rename to stm32f103t8u6/src/usb_vendor.c
diff --git a/stm32f103c8t6/src/usb_vendor.h b/stm32f103t8u6/src/usb_vendor.h
similarity index 100%
rename from stm32f103c8t6/src/usb_vendor.h
rename to stm32f103t8u6/src/usb_vendor.h
diff --git a/stm32f103c8t6/third_party/core/core_cm3.h b/stm32f103t8u6/third_party/core/core_cm3.h
similarity index 100%
rename from stm32f103c8t6/third_party/core/core_cm3.h
rename to stm32f103t8u6/third_party/core/core_cm3.h
diff --git a/stm32f103c8t6/third_party/core/core_cmFunc.h b/stm32f103t8u6/third_party/core/core_cmFunc.h
similarity index 100%
rename from stm32f103c8t6/third_party/core/core_cmFunc.h
rename to stm32f103t8u6/third_party/core/core_cmFunc.h
diff --git a/stm32f103c8t6/third_party/core/core_cmInstr.h b/stm32f103t8u6/third_party/core/core_cmInstr.h
similarity index 100%
rename from stm32f103c8t6/third_party/core/core_cmInstr.h
rename to stm32f103t8u6/third_party/core/core_cmInstr.h
diff --git a/stm32f103c8t6/third_party/core/core_generic.h b/stm32f103t8u6/third_party/core/core_generic.h
similarity index 100%
rename from stm32f103c8t6/third_party/core/core_generic.h
rename to stm32f103t8u6/third_party/core/core_generic.h
diff --git a/stm32f103c8t6/third_party/device/stm32f103xb.h b/stm32f103t8u6/third_party/device/stm32f103xb.h
similarity index 100%
rename from stm32f103c8t6/third_party/device/stm32f103xb.h
rename to stm32f103t8u6/third_party/device/stm32f103xb.h
diff --git a/stm32f103c8t6/third_party/device/stm32f1xx.h b/stm32f103t8u6/third_party/device/stm32f1xx.h
similarity index 100%
rename from stm32f103c8t6/third_party/device/stm32f1xx.h
rename to stm32f103t8u6/third_party/device/stm32f1xx.h
diff --git a/stm32f103c8t6/third_party/device/system_stm32f1xx.h b/stm32f103t8u6/third_party/device/system_stm32f1xx.h
similarity index 100%
rename from stm32f103c8t6/third_party/device/system_stm32f1xx.h
rename to stm32f103t8u6/third_party/device/system_stm32f1xx.h