diff --git a/hw/bsp/stm32l4/boards/stm32l476_disco/STM32L476VGTx_FLASH.ld b/hw/bsp/stm32l4/boards/stm32l476disco/STM32L476VGTx_FLASH.ld
similarity index 100%
rename from hw/bsp/stm32l4/boards/stm32l476_disco/STM32L476VGTx_FLASH.ld
rename to hw/bsp/stm32l4/boards/stm32l476disco/STM32L476VGTx_FLASH.ld
diff --git a/hw/bsp/stm32l4/boards/stm32l476_disco/board.h b/hw/bsp/stm32l4/boards/stm32l476disco/board.h
similarity index 100%
rename from hw/bsp/stm32l4/boards/stm32l476_disco/board.h
rename to hw/bsp/stm32l4/boards/stm32l476disco/board.h
diff --git a/hw/bsp/stm32l4/boards/stm32l476_disco/board.mk b/hw/bsp/stm32l4/boards/stm32l476disco/board.mk
similarity index 100%
rename from hw/bsp/stm32l4/boards/stm32l476_disco/board.mk
rename to hw/bsp/stm32l4/boards/stm32l476disco/board.mk
diff --git a/hw/bsp/stm32l4/boards/stm32l4p5_nucleo/STM32L4P5ZGTX_FLASH.ld b/hw/bsp/stm32l4/boards/stm32l4p5nucleo/STM32L4P5ZGTX_FLASH.ld
similarity index 100%
rename from hw/bsp/stm32l4/boards/stm32l4p5_nucleo/STM32L4P5ZGTX_FLASH.ld
rename to hw/bsp/stm32l4/boards/stm32l4p5nucleo/STM32L4P5ZGTX_FLASH.ld
diff --git a/hw/bsp/stm32l4/boards/stm32l4p5_nucleo/board.h b/hw/bsp/stm32l4/boards/stm32l4p5nucleo/board.h
similarity index 100%
rename from hw/bsp/stm32l4/boards/stm32l4p5_nucleo/board.h
rename to hw/bsp/stm32l4/boards/stm32l4p5nucleo/board.h
diff --git a/hw/bsp/stm32l4/boards/stm32l4p5_nucleo/board.mk b/hw/bsp/stm32l4/boards/stm32l4p5nucleo/board.mk
similarity index 100%
rename from hw/bsp/stm32l4/boards/stm32l4p5_nucleo/board.mk
rename to hw/bsp/stm32l4/boards/stm32l4p5nucleo/board.mk
diff --git a/hw/bsp/stm32l4/boards/stm32l4r5_nucleo/STM32L4RXxI_FLASH.ld b/hw/bsp/stm32l4/boards/stm32l4r5nucleo/STM32L4RXxI_FLASH.ld
similarity index 100%
rename from hw/bsp/stm32l4/boards/stm32l4r5_nucleo/STM32L4RXxI_FLASH.ld
rename to hw/bsp/stm32l4/boards/stm32l4r5nucleo/STM32L4RXxI_FLASH.ld
diff --git a/hw/bsp/stm32l4/boards/stm32l4r5_nucleo/board.h b/hw/bsp/stm32l4/boards/stm32l4r5nucleo/board.h
similarity index 100%
rename from hw/bsp/stm32l4/boards/stm32l4r5_nucleo/board.h
rename to hw/bsp/stm32l4/boards/stm32l4r5nucleo/board.h
diff --git a/hw/bsp/stm32l4/boards/stm32l4r5_nucleo/board.mk b/hw/bsp/stm32l4/boards/stm32l4r5nucleo/board.mk
similarity index 100%
rename from hw/bsp/stm32l4/boards/stm32l4r5_nucleo/board.mk
rename to hw/bsp/stm32l4/boards/stm32l4r5nucleo/board.mk