diff --git a/boards/nucleo-f401/Makefile b/boards/nucleo-f401re/Makefile
similarity index 100%
rename from boards/nucleo-f401/Makefile
rename to boards/nucleo-f401re/Makefile
diff --git a/boards/nucleo-f401/Makefile.dep b/boards/nucleo-f401re/Makefile.dep
similarity index 100%
rename from boards/nucleo-f401/Makefile.dep
rename to boards/nucleo-f401re/Makefile.dep
diff --git a/boards/nucleo-f401/Makefile.features b/boards/nucleo-f401re/Makefile.features
similarity index 100%
rename from boards/nucleo-f401/Makefile.features
rename to boards/nucleo-f401re/Makefile.features
diff --git a/boards/nucleo-f401/Makefile.include b/boards/nucleo-f401re/Makefile.include
similarity index 76%
rename from boards/nucleo-f401/Makefile.include
rename to boards/nucleo-f401re/Makefile.include
index 0d2f4a1d1664654d06a31abe46dc1310c9a78c45..77e0f0f69e35ba86dac88ebfd5a55f9c4218bde4 100644
--- a/boards/nucleo-f401/Makefile.include
+++ b/boards/nucleo-f401re/Makefile.include
@@ -1,4 +1,4 @@
-# define the cpu used by the nucleo-f401 board
+# define the cpu used by the nucleo-f401re board
export CPU = stm32f4
export CPU_MODEL = stm32f401re
diff --git a/boards/nucleo-f401/include/periph_conf.h b/boards/nucleo-f401re/include/periph_conf.h
similarity index 98%
rename from boards/nucleo-f401/include/periph_conf.h
rename to boards/nucleo-f401re/include/periph_conf.h
index 02623dece1f5d1a7fba9d3eca5b31557a5d1af4d..3069ee9e33e3b4777bf4151a40c47dad208386e5 100644
--- a/boards/nucleo-f401/include/periph_conf.h
+++ b/boards/nucleo-f401re/include/periph_conf.h
@@ -7,13 +7,13 @@
*/
/**
- * @defgroup boards_nucleo-f401 STM32 Nucleo-F401
+ * @defgroup boards_nucleo-f401re STM32 Nucleo-F401RE
* @ingroup boards_common_nucleo64
- * @brief Support for the STM32 Nucleo-F401
+ * @brief Support for the STM32 Nucleo-F401RE
* @{
*
* @file
- * @name Peripheral MCU configuration for the nucleo-f401 board
+ * @name Peripheral MCU configuration for the nucleo-f401re board
*
* @author Lari Lehtomäki <lari@lehtomaki.fi>
*/
diff --git a/cpu/stm32f4/Makefile.features b/cpu/stm32f4/Makefile.features
index 0bc5724d863a074a1a4a570c69f744b7ebdd59b3..d4842c3edd6b0068b43571b4dcd527fae4df4c90 100644
--- a/cpu/stm32f4/Makefile.features
+++ b/cpu/stm32f4/Makefile.features
@@ -5,7 +5,7 @@ FEATURES_PROVIDED += periph_hwrng
# stm32f4 have an RNG peripheral. As during evaluation of the features , no
# CPU variable is available, we need to filter by board.
#
-BOARDS_WITHOUT_HWRNG += nucleo-f401
+BOARDS_WITHOUT_HWRNG += nucleo-f401re
BOARDS_WITHOUT_HWRNG += nucleo-f411
BOARDS_WITHOUT_HWRNG += nucleo-f446
BOARDS_WITHOUT_HWRNG += nucleo144-f446
diff --git a/tests/mpu_stack_guard/Makefile b/tests/mpu_stack_guard/Makefile
index 365cf852e92e2d6f223ff2a31db49404ef9881bb..a264c460c08014a559d85f136d4f7bbbbbd01313 100644
--- a/tests/mpu_stack_guard/Makefile
+++ b/tests/mpu_stack_guard/Makefile
@@ -22,7 +22,7 @@ BOARD_WHITELIST += nucleo-f103rb # cortex-m3
BOARD_WHITELIST += nucleo-f207zg # cortex-m3
BOARD_WHITELIST += nucleo-f303re # cortex-m4f
BOARD_WHITELIST += nucleo-f334r8 # cortex-m4f
-BOARD_WHITELIST += nucleo-f401 # cortex-m4f
+BOARD_WHITELIST += nucleo-f401re # cortex-m4f
BOARD_WHITELIST += nucleo-f446 # cortex-m4f
BOARD_WHITELIST += nucleo-l152 # cortex-m3
BOARD_WHITELIST += openmote-cc2538 # cortex-m3
diff --git a/tests/periph_qdec/Makefile b/tests/periph_qdec/Makefile
index faf60b4f136717acdcea3957acc042a2de2e3c11..809484b1717d4fd16b5d1425dcde20fc9821d299 100644
--- a/tests/periph_qdec/Makefile
+++ b/tests/periph_qdec/Makefile
@@ -1,4 +1,4 @@
-BOARD ?= nucleo-f401
+BOARD ?= nucleo-f401re
include ../Makefile.tests_common
FEATURES_REQUIRED = periph_qdec
diff --git a/tests/periph_qdec/main.c b/tests/periph_qdec/main.c
index 54b6fd29eb2171e8e5b473d7a9a7b50e1e459fdb..e4d7555b7406db85097c77fbf29fe8ba8198792f 100644
--- a/tests/periph_qdec/main.c
+++ b/tests/periph_qdec/main.c
@@ -39,7 +39,7 @@ int main(void)
int32_t value = 0;
puts("Welcome into Quadrature Decoder (QDEC) test program.");
puts("This program will count pulses on all available QDEC channels");
- puts("Written for nucleo-f401, you have to plug signals A and B as follow :");
+ puts("Written for nucleo-f401re, you have to plug signals A and B as follow :");
puts(" QDEC0 : signal A on PA6 and signal B on PA7");
puts(" QDEC1 : signal A on PB6 and signal B on PB7");
puts("Quadrature decoding mode is set to X4 : counting on all edges on both signals");
diff --git a/tests/pkg_cmsis-dsp/Makefile b/tests/pkg_cmsis-dsp/Makefile
index 3abb03f9f977f3fc5fb4eb9c48f8e684f9c9a571..a69d6f89a851ade550800b673730fb9104ee99a6 100644
--- a/tests/pkg_cmsis-dsp/Makefile
+++ b/tests/pkg_cmsis-dsp/Makefile
@@ -18,7 +18,7 @@ BOARD_WHITELIST := \
nucleo-f103rb \
nucleo-f303re \
nucleo-f334r8 \
- nucleo-f401 \
+ nucleo-f401re \
nucleo-l152 \
openmote-cc2538 \
pba-d-01-kw2x \
diff --git a/tests/pkg_fatfs/Makefile b/tests/pkg_fatfs/Makefile
index fd3f6e23fb702423bc0713ba3dc3646158144fce..5678cdfdf2fb223bf9a34d16e2465ce477cf090f 100644
--- a/tests/pkg_fatfs/Makefile
+++ b/tests/pkg_fatfs/Makefile
@@ -14,7 +14,7 @@ BOARD_WHITELIST := airfy-beacon arduino-due arduino-duemilanove arduino-mega2560
nucleo144-f412 nucleo144-f413 nucleo144-f429 nucleo144-f446 \
nucleo32-f031 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
nucleo32-l432 nucleo-f072rb nucleo-f091rc nucleo-f103rb nucleo-f302r8 \
- nucleo-f303re nucleo-f334r8 nucleo-f401 nucleo-f410 nucleo-f411 \
+ nucleo-f303re nucleo-f334r8 nucleo-f401re nucleo-f410 nucleo-f411 \
nucleo-f446 nucleo-l053 nucleo-l073 nucleo-l152 nucleo-l476 \
nz32-sc151 openmote-cc2538 pba-d-01-kw2x remote-pa remote-reva \
remote-revb samd21-xpro saml21-xpro samr21-xpro sltb001a \
diff --git a/tests/pkg_fatfs_vfs/Makefile b/tests/pkg_fatfs_vfs/Makefile
index b531c27b42cc83b1fd4c59afdf825646d5c3f4c8..48d07d245b07b51917f9738f2e7e1d3452e794d8 100644
--- a/tests/pkg_fatfs_vfs/Makefile
+++ b/tests/pkg_fatfs_vfs/Makefile
@@ -37,7 +37,7 @@ BOARD_WHITELIST := airfy-beacon arduino-due arduino-duemilanove arduino-mega2560
nucleo144-f412 nucleo144-f413 nucleo144-f429 nucleo144-f446 \
nucleo32-f042 nucleo32-f303 nucleo32-l031 \
nucleo32-l432 nucleo-f072rb nucleo-f091rc nucleo-f103rb nucleo-f302r8 \
- nucleo-f303re nucleo-f334r8 nucleo-f401 nucleo-f410 nucleo-f411 \
+ nucleo-f303re nucleo-f334r8 nucleo-f401re nucleo-f410 nucleo-f411 \
nucleo-f446 nucleo-l053 nucleo-l073 nucleo-l152 nucleo-l476 \
nz32-sc151 openmote-cc2538 pba-d-01-kw2x remote-pa remote-reva \
remote-revb samd21-xpro saml21-xpro samr21-xpro sltb001a \
diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index 9524df967ba8577521d8d783d510f0cd9da65d8d..f19fc77b97c55fbfa5d6eb88fa57dc9f76516f25 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -138,7 +138,7 @@ ARM_CORTEX_M_BOARDS := airfy-beacon \
nucleo-f302r8 \
nucleo-f303re \
nucleo-f334r8 \
- nucleo-f401 \
+ nucleo-f401re \
nucleo-f410 \
nucleo-f411 \
nucleo-f446 \