diff --git a/examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject b/examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject
index 83067fd0..6f6690d2 100644
--- a/examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject
+++ b/examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject
@@ -61,8 +61,8 @@
       recurse="No" />
     <folder Name="hw">
       <folder Name="bsp">
-        <folder Name="stm32f407g_disc1">
-          <file file_name="../../../../../hw/bsp/stm32f407g_disc1/board_stm32f407g_disc1.c" />
+        <folder Name="stm32f407disco">
+          <file file_name="../../../../../hw/bsp/stm32f407disco/board_stm32f407disco.c" />
         </folder>
         <file file_name="../../../../../hw/bsp/board.h" />
       </folder>
@@ -76,11 +76,11 @@
       </folder>
     </folder>
     <configuration
-      Name="stm32f407g_disc1"
+      Name="stm32f407disco"
       c_preprocessor_definitions="BOARD_STM32F407G_DISC1" />
   </project>
   <configuration
-    Name="stm32f407g_disc1"
+    Name="stm32f407disco"
     c_preprocessor_definitions="DEBUG"
     gcc_debugging_level="Level 3"
     gcc_optimization_level="None" />
diff --git a/hw/bsp/stm32f303disc/STM32F303VCTx_FLASH.ld b/hw/bsp/stm32f303disco/STM32F303VCTx_FLASH.ld
similarity index 100%
rename from hw/bsp/stm32f303disc/STM32F303VCTx_FLASH.ld
rename to hw/bsp/stm32f303disco/STM32F303VCTx_FLASH.ld
diff --git a/hw/bsp/stm32f303disc/board.mk b/hw/bsp/stm32f303disco/board.mk
similarity index 93%
rename from hw/bsp/stm32f303disc/board.mk
rename to hw/bsp/stm32f303disco/board.mk
index 76922a46..7a493c24 100644
--- a/hw/bsp/stm32f303disc/board.mk
+++ b/hw/bsp/stm32f303disco/board.mk
@@ -10,7 +10,7 @@ CFLAGS += \
 	-nostdlib -nostartfiles
 
 # All source paths should be relative to the top level.
-LD_FILE = hw/bsp/stm32f303disc/STM32F303VCTx_FLASH.ld
+LD_FILE = hw/bsp/stm32f303disco/STM32F303VCTx_FLASH.ld
 
 SRC_C += \
 	hw/mcu/st/system-init/system_stm32f3xx.c \
@@ -23,7 +23,7 @@ SRC_S += \
 	hw/mcu/st/startup/stm32f3/startup_stm32f303xc.s
 
 INC += \
-	$(TOP)/hw/bsp/stm32f303disc \
+	$(TOP)/hw/bsp/stm32f303disco \
 	$(TOP)/hw/mcu/st/cmsis \
 	$(TOP)/hw/mcu/st/stm32lib/CMSIS/STM32F3xx/Include \
 	$(TOP)/hw/mcu/st/stm32lib/STM32F3xx_HAL_Driver/Inc
diff --git a/hw/bsp/stm32f303disc/board_stm32f303disc.c b/hw/bsp/stm32f303disco/board_stm32f303disco.c
similarity index 100%
rename from hw/bsp/stm32f303disc/board_stm32f303disc.c
rename to hw/bsp/stm32f303disco/board_stm32f303disco.c
diff --git a/hw/bsp/stm32f303disc/stm32f3xx_hal_conf.h b/hw/bsp/stm32f303disco/stm32f3xx_hal_conf.h
similarity index 100%
rename from hw/bsp/stm32f303disc/stm32f3xx_hal_conf.h
rename to hw/bsp/stm32f303disco/stm32f3xx_hal_conf.h
diff --git a/hw/bsp/stm32f407g_disc1/STM32F407VGTx_FLASH.ld b/hw/bsp/stm32f407disco/STM32F407VGTx_FLASH.ld
similarity index 100%
rename from hw/bsp/stm32f407g_disc1/STM32F407VGTx_FLASH.ld
rename to hw/bsp/stm32f407disco/STM32F407VGTx_FLASH.ld
diff --git a/hw/bsp/stm32f407g_disc1/board.mk b/hw/bsp/stm32f407disco/board.mk
similarity index 93%
rename from hw/bsp/stm32f407g_disc1/board.mk
rename to hw/bsp/stm32f407disco/board.mk
index ab3043a4..18223399 100644
--- a/hw/bsp/stm32f407g_disc1/board.mk
+++ b/hw/bsp/stm32f407disco/board.mk
@@ -10,7 +10,7 @@ CFLAGS += \
   -DCFG_TUSB_MCU=OPT_MCU_STM32F4
 
 # All source paths should be relative to the top level.
-LD_FILE = hw/bsp/stm32f407g_disc1/STM32F407VGTx_FLASH.ld
+LD_FILE = hw/bsp/stm32f407disco/STM32F407VGTx_FLASH.ld
 
 SRC_C += \
 	hw/mcu/st/system-init/system_stm32f4xx.c
diff --git a/hw/bsp/stm32f407g_disc1/board_stm32f407g_disc1.c b/hw/bsp/stm32f407disco/board_stm32f407disco.c
similarity index 100%
rename from hw/bsp/stm32f407g_disc1/board_stm32f407g_disc1.c
rename to hw/bsp/stm32f407disco/board_stm32f407disco.c
diff --git a/hw/mcu/st/README.md b/hw/mcu/st/README.md
index 203e47c3..c1313d8d 100644
--- a/hw/mcu/st/README.md
+++ b/hw/mcu/st/README.md
@@ -47,6 +47,6 @@ these files in one place.
   * ARM-provided headers are stored in the [cmsis](cmsis) directory.
   * The linker script for the STM32F4-DISCOVERY board demo is supplied as
     part of TinyUSB's
-    [Board Support Packages](../../bsp/stm32f407g_disc1/STM32F407VGTx_FLASH.ld).
+    [Board Support Packages](../../bsp/stm32f407disco/STM32F407VGTx_FLASH.ld).
   The above files were extracted from a dummy stm32cube project in February
   2019.