diff --git a/boards/nucleo144-f303/Makefile b/boards/nucleo-f303ze/Makefile
similarity index 100%
rename from boards/nucleo144-f303/Makefile
rename to boards/nucleo-f303ze/Makefile
diff --git a/boards/nucleo144-f303/Makefile.dep b/boards/nucleo-f303ze/Makefile.dep
similarity index 100%
rename from boards/nucleo144-f303/Makefile.dep
rename to boards/nucleo-f303ze/Makefile.dep
diff --git a/boards/nucleo144-f303/Makefile.features b/boards/nucleo-f303ze/Makefile.features
similarity index 100%
rename from boards/nucleo144-f303/Makefile.features
rename to boards/nucleo-f303ze/Makefile.features
diff --git a/boards/nucleo144-f303/Makefile.include b/boards/nucleo-f303ze/Makefile.include
similarity index 76%
rename from boards/nucleo144-f303/Makefile.include
rename to boards/nucleo-f303ze/Makefile.include
index f805e3f6d0f48657b5cdab226e0bee2f68d645b4..bd2345395226606a39c944ea158b2147d14c6a3b 100644
--- a/boards/nucleo144-f303/Makefile.include
+++ b/boards/nucleo-f303ze/Makefile.include
@@ -1,4 +1,4 @@
-# define the cpu used by the nucleo144-f303 board
+# define the cpu used by the nucleo-f303ze board
export CPU = stm32f3
export CPU_MODEL = stm32f303ze
diff --git a/boards/nucleo144-f303/include/periph_conf.h b/boards/nucleo-f303ze/include/periph_conf.h
similarity index 96%
rename from boards/nucleo144-f303/include/periph_conf.h
rename to boards/nucleo-f303ze/include/periph_conf.h
index ef836738cdc4ec91b5fd1b4206e1bddfe96c4cfb..0eaa2e20bbe0eb0b5d420b5f875491ccb5b1525d 100644
--- a/boards/nucleo144-f303/include/periph_conf.h
+++ b/boards/nucleo-f303ze/include/periph_conf.h
@@ -7,13 +7,13 @@
*/
/**
- * @defgroup boards_nucleo144-f303 STM32 Nucleo144-F303
+ * @defgroup boards_nucleo-f303ze STM32 Nucleo-F303ZE
* @ingroup boards_common_nucleo144
- * @brief Support for the STM32 Nucleo144-F303
+ * @brief Support for the STM32 Nucleo-F303ZE
* @{
*
* @file
- * @name Peripheral MCU configuration for the nucleo144-f303 board
+ * @name Peripheral MCU configuration for the nucleo-f303ze board
*
* @author Alexandre Abadie <alexandre.abadie@inria.fr>
*/
diff --git a/boards/nucleo144-f412/Makefile b/boards/nucleo-f412zg/Makefile
similarity index 100%
rename from boards/nucleo144-f412/Makefile
rename to boards/nucleo-f412zg/Makefile
diff --git a/boards/nucleo144-f412/Makefile.dep b/boards/nucleo-f412zg/Makefile.dep
similarity index 100%
rename from boards/nucleo144-f412/Makefile.dep
rename to boards/nucleo-f412zg/Makefile.dep
diff --git a/boards/nucleo144-f412/Makefile.features b/boards/nucleo-f412zg/Makefile.features
similarity index 100%
rename from boards/nucleo144-f412/Makefile.features
rename to boards/nucleo-f412zg/Makefile.features
diff --git a/boards/nucleo144-f412/Makefile.include b/boards/nucleo-f412zg/Makefile.include
similarity index 100%
rename from boards/nucleo144-f412/Makefile.include
rename to boards/nucleo-f412zg/Makefile.include
diff --git a/boards/nucleo144-f412/include/periph_conf.h b/boards/nucleo-f412zg/include/periph_conf.h
similarity index 97%
rename from boards/nucleo144-f412/include/periph_conf.h
rename to boards/nucleo-f412zg/include/periph_conf.h
index 2adda8dfb3c6bbd9b932786f4994b4b18228968c..631b18c7d10b5ab2947f5051aa481710a5137d14 100644
--- a/boards/nucleo144-f412/include/periph_conf.h
+++ b/boards/nucleo-f412zg/include/periph_conf.h
@@ -8,13 +8,13 @@
*/
/**
- * @defgroup boards_nucleo144-f412 STM32 Nucleo144-F412
+ * @defgroup boards_nucleo-f412zg STM32 Nucleo-F412ZG
* @ingroup boards_common_nucleo144
- * @brief Support for the STM32 Nucleo144-F412
+ * @brief Support for the STM32 Nucleo-F412ZG
* @{
*
* @file
- * @name Peripheral MCU configuration for the nucleo144-f412 board
+ * @name Peripheral MCU configuration for the nucleo-f412zg board
*
* @author Alexandre Abadie <alexandre.abadie@inria.fr>
* @author Vincent Dupont <vincent@otakeys.com>
diff --git a/boards/nucleo144-f413/Makefile b/boards/nucleo-f413zh/Makefile
similarity index 100%
rename from boards/nucleo144-f413/Makefile
rename to boards/nucleo-f413zh/Makefile
diff --git a/boards/nucleo144-f413/Makefile.dep b/boards/nucleo-f413zh/Makefile.dep
similarity index 100%
rename from boards/nucleo144-f413/Makefile.dep
rename to boards/nucleo-f413zh/Makefile.dep
diff --git a/boards/nucleo144-f413/Makefile.features b/boards/nucleo-f413zh/Makefile.features
similarity index 100%
rename from boards/nucleo144-f413/Makefile.features
rename to boards/nucleo-f413zh/Makefile.features
diff --git a/boards/nucleo144-f413/Makefile.include b/boards/nucleo-f413zh/Makefile.include
similarity index 100%
rename from boards/nucleo144-f413/Makefile.include
rename to boards/nucleo-f413zh/Makefile.include
diff --git a/boards/nucleo144-f413/include/periph_conf.h b/boards/nucleo-f413zh/include/periph_conf.h
similarity index 97%
rename from boards/nucleo144-f413/include/periph_conf.h
rename to boards/nucleo-f413zh/include/periph_conf.h
index d5525d06e547069ed694b6f532ed2bf81eaec6aa..1f34609f19358b59aacc37a5b2ebcd2948234c13 100644
--- a/boards/nucleo144-f413/include/periph_conf.h
+++ b/boards/nucleo-f413zh/include/periph_conf.h
@@ -8,13 +8,13 @@
*/
/**
- * @defgroup boards_nucleo144-f413 STM32 Nucleo144-F413
+ * @defgroup boards_nucleo-f413zh STM32 Nucleo-F413ZH
* @ingroup boards_common_nucleo144
- * @brief Support for the STM32 Nucleo144-F413
+ * @brief Support for the STM32 Nucleo-F413ZH
* @{
*
* @file
- * @name Peripheral MCU configuration for the nucleo144-f413 board
+ * @name Peripheral MCU configuration for the nucleo-f413zh board
*
* @author Alexandre Abadie <alexandre.abadie@inria.fr>
* @author Vincent Dupont <vincent@otakeys.com>
diff --git a/boards/nucleo144-f429/Makefile b/boards/nucleo-f429zi/Makefile
similarity index 100%
rename from boards/nucleo144-f429/Makefile
rename to boards/nucleo-f429zi/Makefile
diff --git a/boards/nucleo144-f429/Makefile.dep b/boards/nucleo-f429zi/Makefile.dep
similarity index 100%
rename from boards/nucleo144-f429/Makefile.dep
rename to boards/nucleo-f429zi/Makefile.dep
diff --git a/boards/nucleo144-f429/Makefile.features b/boards/nucleo-f429zi/Makefile.features
similarity index 100%
rename from boards/nucleo144-f429/Makefile.features
rename to boards/nucleo-f429zi/Makefile.features
diff --git a/boards/nucleo144-f429/Makefile.include b/boards/nucleo-f429zi/Makefile.include
similarity index 76%
rename from boards/nucleo144-f429/Makefile.include
rename to boards/nucleo-f429zi/Makefile.include
index b1a0841ff6f05e60d2e5c7069cccd396658995bd..649cf9b8d7fc7ff02fa1755d2e548fbe098da21a 100644
--- a/boards/nucleo144-f429/Makefile.include
+++ b/boards/nucleo-f429zi/Makefile.include
@@ -1,4 +1,4 @@
-# define the cpu used by the nucleo144-f429 board
+# define the cpu used by the nucleo-f429zi board
export CPU = stm32f4
export CPU_MODEL = stm32f429zi
diff --git a/boards/nucleo144-f429/include/periph_conf.h b/boards/nucleo-f429zi/include/periph_conf.h
similarity index 97%
rename from boards/nucleo144-f429/include/periph_conf.h
rename to boards/nucleo-f429zi/include/periph_conf.h
index 20114d728abff06cb73eec62d09f1dd9904f3378..0305335b279de4a64606285ec7ec7bb8df2bb5fd 100644
--- a/boards/nucleo144-f429/include/periph_conf.h
+++ b/boards/nucleo-f429zi/include/periph_conf.h
@@ -7,13 +7,13 @@
*/
/**
- * @defgroup boards_nucleo144-f429 STM32 Nucleo144-F429
+ * @defgroup boards_nucleo-f429zi STM32 Nucleo-F429ZI
* @ingroup boards_common_nucleo144
- * @brief Support for the STM32 Nucleo144-F429
+ * @brief Support for the STM32 Nucleo-F429ZI
* @{
*
* @file
- * @name Peripheral MCU configuration for the nucleo144-f429 board
+ * @name Peripheral MCU configuration for the nucleo-f429zi board
*
* @author Alexandre Abadie <alexandre.abadie@inria.fr>
*/
diff --git a/boards/nucleo144-f446/Makefile b/boards/nucleo-f446ze/Makefile
similarity index 100%
rename from boards/nucleo144-f446/Makefile
rename to boards/nucleo-f446ze/Makefile
diff --git a/boards/nucleo144-f446/Makefile.dep b/boards/nucleo-f446ze/Makefile.dep
similarity index 100%
rename from boards/nucleo144-f446/Makefile.dep
rename to boards/nucleo-f446ze/Makefile.dep
diff --git a/boards/nucleo144-f446/Makefile.features b/boards/nucleo-f446ze/Makefile.features
similarity index 100%
rename from boards/nucleo144-f446/Makefile.features
rename to boards/nucleo-f446ze/Makefile.features
diff --git a/boards/nucleo144-f446/Makefile.include b/boards/nucleo-f446ze/Makefile.include
similarity index 76%
rename from boards/nucleo144-f446/Makefile.include
rename to boards/nucleo-f446ze/Makefile.include
index 4e2567a435e1e176be78bc3b0368526550dd9a85..c5e96698c97fe7b55d84c7e363d04ef3917d3617 100644
--- a/boards/nucleo144-f446/Makefile.include
+++ b/boards/nucleo-f446ze/Makefile.include
@@ -1,4 +1,4 @@
-# define the cpu used by the nucleo144-f446 board
+# define the cpu used by the nucleo-f446ze board
export CPU = stm32f4
export CPU_MODEL = stm32f446ze
diff --git a/boards/nucleo144-f446/include/periph_conf.h b/boards/nucleo-f446ze/include/periph_conf.h
similarity index 97%
rename from boards/nucleo144-f446/include/periph_conf.h
rename to boards/nucleo-f446ze/include/periph_conf.h
index 1ea6a9f2608e9a5d78295379e1d4ae3d5dc23fa9..3316ae1b62a20eee32ebc339fef01e6c15107159 100644
--- a/boards/nucleo144-f446/include/periph_conf.h
+++ b/boards/nucleo-f446ze/include/periph_conf.h
@@ -7,13 +7,13 @@
*/
/**
- * @defgroup boards_nucleo144-f446 STM32 Nucleo144-F446
+ * @defgroup boards_nucleo-f446ze STM32 Nucleo-F446ZE
* @ingroup boards_common_nucleo144
- * @brief Support for the STM32 Nucleo144-F446
+ * @brief Support for the STM32 Nucleo-F446ZE
* @{
*
* @file
- * @name Peripheral MCU configuration for the nucleo144-f446 board
+ * @name Peripheral MCU configuration for the nucleo-f446ze board
*
* @author Alexandre Abadie <alexandre.abadie@inria.fr>
*/
diff --git a/boards/nucleo144-f722/Makefile b/boards/nucleo-f722ze/Makefile
similarity index 100%
rename from boards/nucleo144-f722/Makefile
rename to boards/nucleo-f722ze/Makefile
diff --git a/boards/nucleo144-f722/Makefile.dep b/boards/nucleo-f722ze/Makefile.dep
similarity index 100%
rename from boards/nucleo144-f722/Makefile.dep
rename to boards/nucleo-f722ze/Makefile.dep
diff --git a/boards/nucleo144-f722/Makefile.features b/boards/nucleo-f722ze/Makefile.features
similarity index 100%
rename from boards/nucleo144-f722/Makefile.features
rename to boards/nucleo-f722ze/Makefile.features
diff --git a/boards/nucleo144-f722/Makefile.include b/boards/nucleo-f722ze/Makefile.include
similarity index 100%
rename from boards/nucleo144-f722/Makefile.include
rename to boards/nucleo-f722ze/Makefile.include
diff --git a/boards/nucleo144-f767/include/periph_conf.h b/boards/nucleo-f722ze/include/periph_conf.h
similarity index 95%
rename from boards/nucleo144-f767/include/periph_conf.h
rename to boards/nucleo-f722ze/include/periph_conf.h
index 8f73b44470f8aae7e31641c3edf3d17e793e7ee0..2940494d6a9531626ec6c3f34d629e07a9e8ce20 100644
--- a/boards/nucleo144-f767/include/periph_conf.h
+++ b/boards/nucleo-f722ze/include/periph_conf.h
@@ -7,13 +7,13 @@
*/
/**
- * @defgroup boards_nucleo144-f767 STM32 Nucleo144-F767
+ * @defgroup boards_nucleo-f722ze STM32 Nucleo-F722ZE
* @ingroup boards_common_nucleo144
- * @brief Support for the STM32 Nucleo144-F767
+ * @brief Support for the STM32 Nucleo-F722ZE
* @{
*
* @file
- * @brief Peripheral MCU configuration for the nucleo144-f767 board
+ * @brief Peripheral MCU configuration for the nucleo-f722ze board
*
* @author Alexandre Abadie <alexandre.abadie@inria.fr>
*/
diff --git a/boards/nucleo144-f746/Makefile b/boards/nucleo-f746zg/Makefile
similarity index 100%
rename from boards/nucleo144-f746/Makefile
rename to boards/nucleo-f746zg/Makefile
diff --git a/boards/nucleo144-f746/Makefile.dep b/boards/nucleo-f746zg/Makefile.dep
similarity index 100%
rename from boards/nucleo144-f746/Makefile.dep
rename to boards/nucleo-f746zg/Makefile.dep
diff --git a/boards/nucleo144-f746/Makefile.features b/boards/nucleo-f746zg/Makefile.features
similarity index 100%
rename from boards/nucleo144-f746/Makefile.features
rename to boards/nucleo-f746zg/Makefile.features
diff --git a/boards/nucleo144-f746/Makefile.include b/boards/nucleo-f746zg/Makefile.include
similarity index 100%
rename from boards/nucleo144-f746/Makefile.include
rename to boards/nucleo-f746zg/Makefile.include
diff --git a/boards/nucleo144-f746/include/periph_conf.h b/boards/nucleo-f746zg/include/periph_conf.h
similarity index 95%
rename from boards/nucleo144-f746/include/periph_conf.h
rename to boards/nucleo-f746zg/include/periph_conf.h
index f1831da3cdcfcbaf0d813525003112f04441f877..18e3949634ca17b51b08a1cf8109a5d974e5f607 100644
--- a/boards/nucleo144-f746/include/periph_conf.h
+++ b/boards/nucleo-f746zg/include/periph_conf.h
@@ -7,13 +7,13 @@
*/
/**
- * @defgroup boards_nucleo144-f746 STM32 Nucleo144-F746
+ * @defgroup boards_nucleo-f746zg STM32 Nucleo-F746ZG
* @ingroup boards_common_nucleo144
- * @brief Support for the STM32 Nucleo144-F746
+ * @brief Support for the STM32 Nucleo-F746ZG
* @{
*
* @file
- * @brief Peripheral MCU configuration for the nucleo144-f746 board
+ * @brief Peripheral MCU configuration for the nucleo-f746zg board
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/
diff --git a/boards/nucleo144-f767/Makefile b/boards/nucleo-f767zi/Makefile
similarity index 100%
rename from boards/nucleo144-f767/Makefile
rename to boards/nucleo-f767zi/Makefile
diff --git a/boards/nucleo144-f767/Makefile.dep b/boards/nucleo-f767zi/Makefile.dep
similarity index 100%
rename from boards/nucleo144-f767/Makefile.dep
rename to boards/nucleo-f767zi/Makefile.dep
diff --git a/boards/nucleo144-f767/Makefile.features b/boards/nucleo-f767zi/Makefile.features
similarity index 100%
rename from boards/nucleo144-f767/Makefile.features
rename to boards/nucleo-f767zi/Makefile.features
diff --git a/boards/nucleo144-f767/Makefile.include b/boards/nucleo-f767zi/Makefile.include
similarity index 100%
rename from boards/nucleo144-f767/Makefile.include
rename to boards/nucleo-f767zi/Makefile.include
diff --git a/boards/nucleo144-f722/include/periph_conf.h b/boards/nucleo-f767zi/include/periph_conf.h
similarity index 95%
rename from boards/nucleo144-f722/include/periph_conf.h
rename to boards/nucleo-f767zi/include/periph_conf.h
index 5f23998e9401a54a0b95c24ec87f1581ae5e71e6..5f570a77be9dae3b87e2f21423bdedf5d1d646a4 100644
--- a/boards/nucleo144-f722/include/periph_conf.h
+++ b/boards/nucleo-f767zi/include/periph_conf.h
@@ -7,13 +7,13 @@
*/
/**
- * @defgroup boards_nucleo144-f722 STM32 Nucleo144-F722
+ * @defgroup boards_nucleo-f767zi STM32 Nucleo-F767ZI
* @ingroup boards_common_nucleo144
- * @brief Support for the STM32 Nucleo144-F722
+ * @brief Support for the STM32 Nucleo-F767ZI
* @{
*
* @file
- * @brief Peripheral MCU configuration for the nucleo144-f722 board
+ * @brief Peripheral MCU configuration for the nucleo-f767zi board
*
* @author Alexandre Abadie <alexandre.abadie@inria.fr>
*/
diff --git a/cpu/stm32f4/Makefile.features b/cpu/stm32f4/Makefile.features
index eaed0787e275522f4eba42f31434667e3e18aaa1..f6818fb224c7bc126a75501f9da3e7531adff7e7 100644
--- a/cpu/stm32f4/Makefile.features
+++ b/cpu/stm32f4/Makefile.features
@@ -8,6 +8,6 @@ FEATURES_PROVIDED += periph_hwrng
BOARDS_WITHOUT_HWRNG += nucleo-f401re
BOARDS_WITHOUT_HWRNG += nucleo-f411re
BOARDS_WITHOUT_HWRNG += nucleo-f446re
-BOARDS_WITHOUT_HWRNG += nucleo144-f446
+BOARDS_WITHOUT_HWRNG += nucleo-f446ze
-include $(RIOTCPU)/stm32_common/Makefile.features
diff --git a/tests/pkg_fatfs/Makefile b/tests/pkg_fatfs/Makefile
index 8bf74501e09fff0caae1af1c955fcf8863542b40..ae3a372167199ba29dbc9402fd055a4197d7f19f 100644
--- a/tests/pkg_fatfs/Makefile
+++ b/tests/pkg_fatfs/Makefile
@@ -10,8 +10,8 @@ BOARD_WHITELIST := airfy-beacon arduino-due arduino-duemilanove arduino-mega2560
b-l072z-lrwan1 b-l475e-iot01a bluepill cc2538dk ek-lm4f120xl \
feather-m0 fox frdm-k22f frdm-k64f ikea-tradfri iotlab-a8-m3 \
iotlab-m3 limifrog-v1 maple-mini msb-430 msb-430h msba2 msbiot \
- mulle nrf52840dk nrf52dk nrf6310 nucleo-f207zg nucleo144-f303 \
- nucleo144-f412 nucleo144-f413 nucleo144-f429 nucleo144-f446 \
+ mulle nrf52840dk nrf52dk nrf6310 nucleo-f207zg nucleo-f303ze \
+ nucleo-f412zg nucleo-f413zh nucleo-f429zi nucleo-f446ze \
nucleo32-f031 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
nucleo32-l432 nucleo-f072rb nucleo-f091rc nucleo-f103rb nucleo-f302r8 \
nucleo-f303re nucleo-f334r8 nucleo-f401re nucleo-f410rb nucleo-f411re \
diff --git a/tests/pkg_fatfs_vfs/Makefile b/tests/pkg_fatfs_vfs/Makefile
index 1872f347343fbd341fa5284f1ce514d22c68358d..90937d9d48ae648a8daf22b1c1c3b02a3140e9d1 100644
--- a/tests/pkg_fatfs_vfs/Makefile
+++ b/tests/pkg_fatfs_vfs/Makefile
@@ -33,8 +33,8 @@ BOARD_WHITELIST := airfy-beacon arduino-due arduino-duemilanove arduino-mega2560
b-l072z-lrwan1 b-l475e-iot01a bluepill cc2538dk ek-lm4f120xl \
feather-m0 fox frdm-k22f frdm-k64f ikea-tradfri iotlab-a8-m3 \
iotlab-m3 limifrog-v1 maple-mini msb-430 msb-430h msba2 msbiot \
- mulle nrf52840dk nrf52dk nrf6310 nucleo-f207zg nucleo144-f303 \
- nucleo144-f412 nucleo144-f413 nucleo144-f429 nucleo144-f446 \
+ mulle nrf52840dk nrf52dk nrf6310 nucleo-f207zg nucleo-f303ze \
+ nucleo-f412zg nucleo-f413zh nucleo-f429zi nucleo-f446ze \
nucleo32-f042 nucleo32-f303 nucleo32-l031 \
nucleo32-l432 nucleo-f072rb nucleo-f091rc nucleo-f103rb nucleo-f302r8 \
nucleo-f303re nucleo-f334r8 nucleo-f401re nucleo-f410rb nucleo-f411re \
diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index cf75c56b114b846e7786a9d7536e7d0ed5bcf233..bcf5778c263a445ed94516e40fd853faf2e43978 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -117,14 +117,14 @@ ARM_CORTEX_M_BOARDS := airfy-beacon \
nrf52dk \
nrf6310 \
nucleo-f207zg \
- nucleo144-f303 \
- nucleo144-f412 \
- nucleo144-f413 \
- nucleo144-f429 \
- nucleo144-f446 \
- nucleo144-f722 \
- nucleo144-f746 \
- nucleo144-f767 \
+ nucleo-f303ze \
+ nucleo-f412zg \
+ nucleo-f413zh \
+ nucleo-f429zi \
+ nucleo-f446ze \
+ nucleo-f722ze \
+ nucleo-f746zg \
+ nucleo-f767zi \
nucleo32-f031 \
nucleo32-f042 \
nucleo32-f303 \