diff --git a/os/hal/platforms/STM32F30x/adc_lld.c b/os/hal/platforms/STM32F30x/adc_lld.c
index 48d0efafe..555a2871d 100644
--- a/os/hal/platforms/STM32F30x/adc_lld.c
+++ b/os/hal/platforms/STM32F30x/adc_lld.c
@@ -19,8 +19,8 @@
*/
/**
- * @file STM32F3xx/adc_lld.c
- * @brief STM32F3xx ADC subsystem low level driver source.
+ * @file STM32F30x/adc_lld.c
+ * @brief STM32F30x ADC subsystem low level driver source.
*
* @addtogroup ADC
* @{
diff --git a/os/hal/platforms/STM32F30x/adc_lld.h b/os/hal/platforms/STM32F30x/adc_lld.h
index 3e72d1cf0..cda0c193a 100644
--- a/os/hal/platforms/STM32F30x/adc_lld.h
+++ b/os/hal/platforms/STM32F30x/adc_lld.h
@@ -19,8 +19,8 @@
*/
/**
- * @file STM32F3xx/adc_lld.h
- * @brief STM32F3xx ADC subsystem low level driver header.
+ * @file STM32F30x/adc_lld.h
+ * @brief STM32F30x ADC subsystem low level driver header.
*
* @addtogroup ADC
* @{
diff --git a/os/hal/platforms/STM32F30x/ext_lld_isr.c b/os/hal/platforms/STM32F30x/ext_lld_isr.c
index c310a4394..7017293a1 100644
--- a/os/hal/platforms/STM32F30x/ext_lld_isr.c
+++ b/os/hal/platforms/STM32F30x/ext_lld_isr.c
@@ -19,8 +19,8 @@
*/
/**
- * @file STM32F3xx/ext_lld_isr.c
- * @brief STM32F3xx EXT subsystem low level driver ISR code.
+ * @file STM32F30x/ext_lld_isr.c
+ * @brief STM32F30x EXT subsystem low level driver ISR code.
*
* @addtogroup EXT
* @{
diff --git a/os/hal/platforms/STM32F30x/ext_lld_isr.h b/os/hal/platforms/STM32F30x/ext_lld_isr.h
index 80d05b9d5..6fc84bf6a 100644
--- a/os/hal/platforms/STM32F30x/ext_lld_isr.h
+++ b/os/hal/platforms/STM32F30x/ext_lld_isr.h
@@ -19,8 +19,8 @@
*/
/**
- * @file STM32F3xx/ext_lld_isr.h
- * @brief STM32F3xx EXT subsystem low level driver ISR header.
+ * @file STM32F30x/ext_lld_isr.h
+ * @brief STM32F30x EXT subsystem low level driver ISR header.
*
* @addtogroup EXT
* @{
diff --git a/os/hal/platforms/STM32F30x/hal_lld.c b/os/hal/platforms/STM32F30x/hal_lld.c
index 5370320cb..c903069f9 100644
--- a/os/hal/platforms/STM32F30x/hal_lld.c
+++ b/os/hal/platforms/STM32F30x/hal_lld.c
@@ -19,8 +19,8 @@
*/
/**
- * @file STM32F3xx/hal_lld.c
- * @brief STM32F3xx HAL subsystem low level driver source.
+ * @file STM32F30x/hal_lld.c
+ * @brief STM32F30x HAL subsystem low level driver source.
*
* @addtogroup HAL
* @{
diff --git a/os/hal/platforms/STM32F30x/hal_lld.h b/os/hal/platforms/STM32F30x/hal_lld.h
index 96f4f169d..78da224bc 100644
--- a/os/hal/platforms/STM32F30x/hal_lld.h
+++ b/os/hal/platforms/STM32F30x/hal_lld.h
@@ -19,8 +19,8 @@
*/
/**
- * @file STM32F3xx/hal_lld.h
- * @brief STM32F3xx HAL subsystem low level driver header.
+ * @file STM32F30x/hal_lld.h
+ * @brief STM32F30x HAL subsystem low level driver header.
* @pre This module requires the following macros to be defined in the
* @p board.h file:
* - STM32_LSECLK.
@@ -684,7 +684,7 @@
* Configuration-related checks.
*/
#if !defined(STM32F30x_MCUCONF)
-#error "Using a wrong mcuconf.h file, STM32F3xx_MCUCONF not defined"
+#error "Using a wrong mcuconf.h file, STM32F30x_MCUCONF not defined"
#endif
/*
diff --git a/os/hal/platforms/STM32F30x/platform.mk b/os/hal/platforms/STM32F30x/platform.mk
index 5cfdd415c..143f8ff89 100644
--- a/os/hal/platforms/STM32F30x/platform.mk
+++ b/os/hal/platforms/STM32F30x/platform.mk
@@ -1,8 +1,8 @@
-# List of all the STM32F3xx platform files.
-PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F3xx/stm32_dma.c \
- ${CHIBIOS}/os/hal/platforms/STM32F3xx/hal_lld.c \
- ${CHIBIOS}/os/hal/platforms/STM32F3xx/adc_lld.c \
- ${CHIBIOS}/os/hal/platforms/STM32F3xx/ext_lld_isr.c \
+# List of all the STM32F30x platform files.
+PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F30x/stm32_dma.c \
+ ${CHIBIOS}/os/hal/platforms/STM32F30x/hal_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32F30x/adc_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32F30x/ext_lld_isr.c \
${CHIBIOS}/os/hal/platforms/STM32/can_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/ext_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/gpt_lld.c \
@@ -15,7 +15,7 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F3xx/stm32_dma.c \
${CHIBIOS}/os/hal/platforms/STM32/USBv1/usb_lld.c
# Required include directories
-PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32F3xx \
+PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32F30x \
${CHIBIOS}/os/hal/platforms/STM32 \
${CHIBIOS}/os/hal/platforms/STM32/GPIOv2 \
${CHIBIOS}/os/hal/platforms/STM32/SPIv2 \
diff --git a/os/hal/platforms/STM32F30x/stm32_dma.c b/os/hal/platforms/STM32F30x/stm32_dma.c
index 8daf54f98..2fffadf6d 100644
--- a/os/hal/platforms/STM32F30x/stm32_dma.c
+++ b/os/hal/platforms/STM32F30x/stm32_dma.c
@@ -19,10 +19,10 @@
*/
/**
- * @file STM32F3xx/stm32_dma.c
+ * @file STM32F30x/stm32_dma.c
* @brief DMA helper driver code.
*
- * @addtogroup STM32F3xx_DMA
+ * @addtogroup STM32F30x_DMA
* @details DMA sharing helper driver. In the STM32 the DMA streams are a
* shared resource, this driver allows to allocate and free DMA
* streams at runtime in order to allow all the other device
diff --git a/os/hal/platforms/STM32F30x/stm32_dma.h b/os/hal/platforms/STM32F30x/stm32_dma.h
index a755e76ec..63e9d4265 100644
--- a/os/hal/platforms/STM32F30x/stm32_dma.h
+++ b/os/hal/platforms/STM32F30x/stm32_dma.h
@@ -19,13 +19,13 @@
*/
/**
- * @file STM32F3xx/stm32_dma.h
+ * @file STM32F30x/stm32_dma.h
* @brief DMA helper driver header.
* @note This file requires definitions from the ST header file stm32f30x.h.
* @note This driver uses the new naming convention used for the STM32F2xx
* so the "DMA channels" are referred as "DMA streams".
*
- * @addtogroup STM32F3xx_DMA
+ * @addtogroup STM32F30x_DMA
* @{
*/
diff --git a/os/hal/platforms/STM32F30x/stm32_isr.h b/os/hal/platforms/STM32F30x/stm32_isr.h
index b034d3487..d959e2e7f 100644
--- a/os/hal/platforms/STM32F30x/stm32_isr.h
+++ b/os/hal/platforms/STM32F30x/stm32_isr.h
@@ -19,10 +19,10 @@
*/
/**
- * @file STM32F3xx/stm32_isr.h
+ * @file STM32F30x/stm32_isr.h
* @brief ISR remapper driver header.
*
- * @addtogroup STM32F3xx_ISR
+ * @addtogroup STM32F30x_ISR
* @{
*/
diff --git a/os/hal/platforms/STM32F30x/stm32_rcc.h b/os/hal/platforms/STM32F30x/stm32_rcc.h
index 92ba6cf60..b8c0f76bc 100644
--- a/os/hal/platforms/STM32F30x/stm32_rcc.h
+++ b/os/hal/platforms/STM32F30x/stm32_rcc.h
@@ -19,7 +19,7 @@
*/
/**
- * @file STM32F3xx/stm32_rcc.h
+ * @file STM32F30x/stm32_rcc.h
* @brief RCC helper driver header.
* @note This file requires definitions from the ST header file
* @p stm32f30x.h.
diff --git a/testhal/STM32F3xx/ADC/.cproject b/testhal/STM32F3xx/ADC/.cproject
index e1ca98155..18ecf6a9c 100644
--- a/testhal/STM32F3xx/ADC/.cproject
+++ b/testhal/STM32F3xx/ADC/.cproject
@@ -39,7 +39,7 @@
-
+
diff --git a/testhal/STM32F3xx/ADC/.project b/testhal/STM32F3xx/ADC/.project
index b8ec7983b..723f89815 100644
--- a/testhal/STM32F3xx/ADC/.project
+++ b/testhal/STM32F3xx/ADC/.project
@@ -1,6 +1,6 @@
- STM32F3xx-ADC
+ STM32F30x-ADC
diff --git a/testhal/STM32F3xx/ADC/Makefile b/testhal/STM32F3xx/ADC/Makefile
index 792e6e86e..455c2e5da 100644
--- a/testhal/STM32F3xx/ADC/Makefile
+++ b/testhal/STM32F3xx/ADC/Makefile
@@ -66,7 +66,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F3xx/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/testhal/STM32F3xx/ADC/readme.txt b/testhal/STM32F3xx/ADC/readme.txt
index e910d3adf..bc0a30424 100644
--- a/testhal/STM32F3xx/ADC/readme.txt
+++ b/testhal/STM32F3xx/ADC/readme.txt
@@ -1,5 +1,5 @@
*****************************************************************************
-** ChibiOS/RT HAL - ADC driver demo for STM32F3xx. **
+** ChibiOS/RT HAL - ADC driver demo for STM32F30x. **
*****************************************************************************
** TARGET **
@@ -8,7 +8,7 @@ The demo runs on an STMicroelectronics STM32F3-Discovery board.
** The Demo **
-The application demonstrates the use of the STM32F3xx ADC driver.
+The application demonstrates the use of the STM32F30x ADC driver.
** Board Setup **
diff --git a/testhal/STM32F3xx/ADC_DUAL/.cproject b/testhal/STM32F3xx/ADC_DUAL/.cproject
index 7b50bb642..151e30397 100644
--- a/testhal/STM32F3xx/ADC_DUAL/.cproject
+++ b/testhal/STM32F3xx/ADC_DUAL/.cproject
@@ -39,7 +39,7 @@
-
+
diff --git a/testhal/STM32F3xx/ADC_DUAL/.project b/testhal/STM32F3xx/ADC_DUAL/.project
index 51b055a7a..216f76c48 100644
--- a/testhal/STM32F3xx/ADC_DUAL/.project
+++ b/testhal/STM32F3xx/ADC_DUAL/.project
@@ -1,6 +1,6 @@
- STM32F3xx-ADC_DUAL
+ STM32F30x-ADC_DUAL
diff --git a/testhal/STM32F3xx/ADC_DUAL/Makefile b/testhal/STM32F3xx/ADC_DUAL/Makefile
index 792e6e86e..455c2e5da 100644
--- a/testhal/STM32F3xx/ADC_DUAL/Makefile
+++ b/testhal/STM32F3xx/ADC_DUAL/Makefile
@@ -66,7 +66,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F3xx/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/testhal/STM32F3xx/ADC_DUAL/readme.txt b/testhal/STM32F3xx/ADC_DUAL/readme.txt
index e910d3adf..bc0a30424 100644
--- a/testhal/STM32F3xx/ADC_DUAL/readme.txt
+++ b/testhal/STM32F3xx/ADC_DUAL/readme.txt
@@ -1,5 +1,5 @@
*****************************************************************************
-** ChibiOS/RT HAL - ADC driver demo for STM32F3xx. **
+** ChibiOS/RT HAL - ADC driver demo for STM32F30x. **
*****************************************************************************
** TARGET **
@@ -8,7 +8,7 @@ The demo runs on an STMicroelectronics STM32F3-Discovery board.
** The Demo **
-The application demonstrates the use of the STM32F3xx ADC driver.
+The application demonstrates the use of the STM32F30x ADC driver.
** Board Setup **
diff --git a/testhal/STM32F3xx/CAN/.cproject b/testhal/STM32F3xx/CAN/.cproject
index 61d6dfa9a..7cdad62bb 100644
--- a/testhal/STM32F3xx/CAN/.cproject
+++ b/testhal/STM32F3xx/CAN/.cproject
@@ -39,7 +39,7 @@
-
+
diff --git a/testhal/STM32F3xx/CAN/.project b/testhal/STM32F3xx/CAN/.project
index 3699a01b8..a2e4698ac 100644
--- a/testhal/STM32F3xx/CAN/.project
+++ b/testhal/STM32F3xx/CAN/.project
@@ -1,6 +1,6 @@
- STM32F3xx-CAN
+ STM32F30x-CAN
diff --git a/testhal/STM32F3xx/CAN/Makefile b/testhal/STM32F3xx/CAN/Makefile
index 792e6e86e..455c2e5da 100644
--- a/testhal/STM32F3xx/CAN/Makefile
+++ b/testhal/STM32F3xx/CAN/Makefile
@@ -66,7 +66,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F3xx/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/testhal/STM32F3xx/CAN/readme.txt b/testhal/STM32F3xx/CAN/readme.txt
index d4f973b1b..983b34d1d 100644
--- a/testhal/STM32F3xx/CAN/readme.txt
+++ b/testhal/STM32F3xx/CAN/readme.txt
@@ -1,5 +1,5 @@
*****************************************************************************
-** ChibiOS/RT HAL - CAN driver demo for STM32F3xx. **
+** ChibiOS/RT HAL - CAN driver demo for STM32F30x. **
*****************************************************************************
** TARGET **
@@ -8,7 +8,7 @@ The demo runs on an STMicroelectronics STM32F3-Discovery board.
** The Demo **
-The application demonstrates the use of the STM32F3xx CAN driver.
+The application demonstrates the use of the STM32F30x CAN driver.
** Build Procedure **
diff --git a/testhal/STM32F3xx/EXT/.cproject b/testhal/STM32F3xx/EXT/.cproject
index 89c387849..81789e942 100644
--- a/testhal/STM32F3xx/EXT/.cproject
+++ b/testhal/STM32F3xx/EXT/.cproject
@@ -39,7 +39,7 @@
-
+
diff --git a/testhal/STM32F3xx/EXT/.project b/testhal/STM32F3xx/EXT/.project
index 7bc04c333..7c6f467a6 100644
--- a/testhal/STM32F3xx/EXT/.project
+++ b/testhal/STM32F3xx/EXT/.project
@@ -1,6 +1,6 @@
- STM32F3xx-EXT
+ STM32F30x-EXT
diff --git a/testhal/STM32F3xx/EXT/Makefile b/testhal/STM32F3xx/EXT/Makefile
index fac110b8c..8e7cec92d 100644
--- a/testhal/STM32F3xx/EXT/Makefile
+++ b/testhal/STM32F3xx/EXT/Makefile
@@ -66,7 +66,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F3xx/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/testhal/STM32F3xx/EXT/readme.txt b/testhal/STM32F3xx/EXT/readme.txt
index 7ac1f8027..39255526b 100644
--- a/testhal/STM32F3xx/EXT/readme.txt
+++ b/testhal/STM32F3xx/EXT/readme.txt
@@ -1,5 +1,5 @@
*****************************************************************************
-** ChibiOS/RT HAL - EXT driver demo for STM32F3xx. **
+** ChibiOS/RT HAL - EXT driver demo for STM32F30x. **
*****************************************************************************
** TARGET **
@@ -8,7 +8,7 @@ The demo runs on an STMicroelectronics STM32F3-Discovery board.
** The Demo **
-The application demonstrates the use of the STM32F3xx EXT driver.
+The application demonstrates the use of the STM32F30x EXT driver.
** Board Setup **
diff --git a/testhal/STM32F3xx/IRQ_STORM/.cproject b/testhal/STM32F3xx/IRQ_STORM/.cproject
index 2256fbf4d..ed2858c43 100644
--- a/testhal/STM32F3xx/IRQ_STORM/.cproject
+++ b/testhal/STM32F3xx/IRQ_STORM/.cproject
@@ -39,7 +39,7 @@
-
+
diff --git a/testhal/STM32F3xx/IRQ_STORM/.project b/testhal/STM32F3xx/IRQ_STORM/.project
index 572d194e7..a7a6d0b2e 100644
--- a/testhal/STM32F3xx/IRQ_STORM/.project
+++ b/testhal/STM32F3xx/IRQ_STORM/.project
@@ -1,6 +1,6 @@
- STM32F3xx-IRQ_STORM
+ STM32F30x-IRQ_STORM
diff --git a/testhal/STM32F3xx/IRQ_STORM/Makefile b/testhal/STM32F3xx/IRQ_STORM/Makefile
index 792e6e86e..455c2e5da 100644
--- a/testhal/STM32F3xx/IRQ_STORM/Makefile
+++ b/testhal/STM32F3xx/IRQ_STORM/Makefile
@@ -66,7 +66,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F3xx/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/testhal/STM32F3xx/IRQ_STORM/readme.txt b/testhal/STM32F3xx/IRQ_STORM/readme.txt
index 05c37dd09..5193c5f89 100644
--- a/testhal/STM32F3xx/IRQ_STORM/readme.txt
+++ b/testhal/STM32F3xx/IRQ_STORM/readme.txt
@@ -1,5 +1,5 @@
*****************************************************************************
-** ChibiOS/RT HAL - IRQ_STORM stress test demo for STM32F3xx. **
+** ChibiOS/RT HAL - IRQ_STORM stress test demo for STM32F30x. **
*****************************************************************************
** TARGET **
@@ -8,7 +8,7 @@ The demo runs on an STMicroelectronics STM32F3-Discovery board.
** The Demo **
-The application demonstrates the use of the STM32F3xx GPT, PAL and Serial
+The application demonstrates the use of the STM32F30x GPT, PAL and Serial
drivers in order to implement a system stress demo.
** Board Setup **
diff --git a/testhal/STM32F3xx/PWM-ICU/.cproject b/testhal/STM32F3xx/PWM-ICU/.cproject
index df450abda..0bb5b2f00 100644
--- a/testhal/STM32F3xx/PWM-ICU/.cproject
+++ b/testhal/STM32F3xx/PWM-ICU/.cproject
@@ -39,7 +39,7 @@
-
+
diff --git a/testhal/STM32F3xx/PWM-ICU/.project b/testhal/STM32F3xx/PWM-ICU/.project
index ec2f3b708..6d36832e8 100644
--- a/testhal/STM32F3xx/PWM-ICU/.project
+++ b/testhal/STM32F3xx/PWM-ICU/.project
@@ -1,6 +1,6 @@
- STM32F3xx-PWM-ICU
+ STM32F30x-PWM-ICU
diff --git a/testhal/STM32F3xx/PWM-ICU/Makefile b/testhal/STM32F3xx/PWM-ICU/Makefile
index 792e6e86e..455c2e5da 100644
--- a/testhal/STM32F3xx/PWM-ICU/Makefile
+++ b/testhal/STM32F3xx/PWM-ICU/Makefile
@@ -66,7 +66,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F3xx/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/testhal/STM32F3xx/PWM-ICU/readme.txt b/testhal/STM32F3xx/PWM-ICU/readme.txt
index 786db9642..cfb53f76a 100644
--- a/testhal/STM32F3xx/PWM-ICU/readme.txt
+++ b/testhal/STM32F3xx/PWM-ICU/readme.txt
@@ -1,5 +1,5 @@
*****************************************************************************
-** ChibiOS/RT HAL - PWM-ICU drivers demo for STM32F3xx. **
+** ChibiOS/RT HAL - PWM-ICU drivers demo for STM32F30x. **
*****************************************************************************
** TARGET **
@@ -8,7 +8,7 @@ The demo runs on an STMicroelectronics STM32F3-Discovery board.
** The Demo **
-The application demonstrates the use of the STM32F3xx PWM-ICU drivers.
+The application demonstrates the use of the STM32F30x PWM-ICU drivers.
** Board Setup **
diff --git a/testhal/STM32F3xx/SPI/.cproject b/testhal/STM32F3xx/SPI/.cproject
index bd3a84398..104d73e64 100644
--- a/testhal/STM32F3xx/SPI/.cproject
+++ b/testhal/STM32F3xx/SPI/.cproject
@@ -39,7 +39,7 @@
-
+
diff --git a/testhal/STM32F3xx/SPI/.project b/testhal/STM32F3xx/SPI/.project
index 5116cd835..61b728dcf 100644
--- a/testhal/STM32F3xx/SPI/.project
+++ b/testhal/STM32F3xx/SPI/.project
@@ -1,6 +1,6 @@
- STM32F3xx-SPI
+ STM32F30x-SPI
diff --git a/testhal/STM32F3xx/SPI/Makefile b/testhal/STM32F3xx/SPI/Makefile
index 792e6e86e..455c2e5da 100644
--- a/testhal/STM32F3xx/SPI/Makefile
+++ b/testhal/STM32F3xx/SPI/Makefile
@@ -66,7 +66,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F3xx/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/testhal/STM32F3xx/SPI/readme.txt b/testhal/STM32F3xx/SPI/readme.txt
index 285d9c724..9275c06ee 100644
--- a/testhal/STM32F3xx/SPI/readme.txt
+++ b/testhal/STM32F3xx/SPI/readme.txt
@@ -1,5 +1,5 @@
*****************************************************************************
-** ChibiOS/RT HAL - SPI driver demo for STM32F3xx. **
+** ChibiOS/RT HAL - SPI driver demo for STM32F30x. **
*****************************************************************************
** TARGET **
@@ -8,7 +8,7 @@ The demo runs on an ST STM32F3-Discovery board.
** The Demo **
-The application demonstrates the use of the STM32F3xx SPI driver.
+The application demonstrates the use of the STM32F30x SPI driver.
** Board Setup **
diff --git a/testhal/STM32F3xx/UART/.cproject b/testhal/STM32F3xx/UART/.cproject
index 391315ffb..661d548d0 100644
--- a/testhal/STM32F3xx/UART/.cproject
+++ b/testhal/STM32F3xx/UART/.cproject
@@ -39,7 +39,7 @@
-
+
diff --git a/testhal/STM32F3xx/UART/.project b/testhal/STM32F3xx/UART/.project
index 07c515e30..24b9d53ce 100644
--- a/testhal/STM32F3xx/UART/.project
+++ b/testhal/STM32F3xx/UART/.project
@@ -1,6 +1,6 @@
- STM32F3xx-UART
+ STM32F30x-UART
diff --git a/testhal/STM32F3xx/UART/Makefile b/testhal/STM32F3xx/UART/Makefile
index fac110b8c..8e7cec92d 100644
--- a/testhal/STM32F3xx/UART/Makefile
+++ b/testhal/STM32F3xx/UART/Makefile
@@ -66,7 +66,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F3xx/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/testhal/STM32F3xx/UART/readme.txt b/testhal/STM32F3xx/UART/readme.txt
index fb3648b1c..3f55599a8 100644
--- a/testhal/STM32F3xx/UART/readme.txt
+++ b/testhal/STM32F3xx/UART/readme.txt
@@ -1,5 +1,5 @@
*****************************************************************************
-** ChibiOS/RT HAL - UART driver demo for STM32F3xx. **
+** ChibiOS/RT HAL - UART driver demo for STM32F30x. **
*****************************************************************************
** TARGET **
@@ -8,7 +8,7 @@ The demo runs on an STMicroelectronics STM32F3-Discovery board.
** The Demo **
-The application demonstrates the use of the STM32F3xx UART driver.
+The application demonstrates the use of the STM32F30x UART driver.
** Board Setup **
diff --git a/testhal/STM32F3xx/USB_CDC/.cproject b/testhal/STM32F3xx/USB_CDC/.cproject
index 9167d7399..839c40d30 100644
--- a/testhal/STM32F3xx/USB_CDC/.cproject
+++ b/testhal/STM32F3xx/USB_CDC/.cproject
@@ -39,7 +39,7 @@
-
+
diff --git a/testhal/STM32F3xx/USB_CDC/.project b/testhal/STM32F3xx/USB_CDC/.project
index 33ae145eb..a1dcbcd63 100644
--- a/testhal/STM32F3xx/USB_CDC/.project
+++ b/testhal/STM32F3xx/USB_CDC/.project
@@ -1,6 +1,6 @@
- STM32F3xx-USB_CDC
+ STM32F30x-USB_CDC
diff --git a/testhal/STM32F3xx/USB_CDC/Makefile b/testhal/STM32F3xx/USB_CDC/Makefile
index 0e2cb9a0d..1f03d2992 100644
--- a/testhal/STM32F3xx/USB_CDC/Makefile
+++ b/testhal/STM32F3xx/USB_CDC/Makefile
@@ -66,7 +66,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F3xx/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/testhal/STM32F3xx/USB_CDC/readme.txt b/testhal/STM32F3xx/USB_CDC/readme.txt
index c6581d26e..39055f999 100644
--- a/testhal/STM32F3xx/USB_CDC/readme.txt
+++ b/testhal/STM32F3xx/USB_CDC/readme.txt
@@ -1,5 +1,5 @@
*****************************************************************************
-** ChibiOS/RT HAL - USB-CDC driver demo for STM32F3xx. **
+** ChibiOS/RT HAL - USB-CDC driver demo for STM32F30x. **
*****************************************************************************
** TARGET **
@@ -8,7 +8,7 @@ The demo runs on an ST STM32F3-Discovery board.
** The Demo **
-The application demonstrates the use of the STM32F3xx USB driver.
+The application demonstrates the use of the STM32F30x USB driver.
** Build Procedure **