diff --git a/boards/nucleo-f411/Makefile b/boards/nucleo-f411re/Makefile
similarity index 100%
rename from boards/nucleo-f411/Makefile
rename to boards/nucleo-f411re/Makefile
diff --git a/boards/nucleo-f411/Makefile.dep b/boards/nucleo-f411re/Makefile.dep
similarity index 100%
rename from boards/nucleo-f411/Makefile.dep
rename to boards/nucleo-f411re/Makefile.dep
diff --git a/boards/nucleo-f411/Makefile.features b/boards/nucleo-f411re/Makefile.features
similarity index 100%
rename from boards/nucleo-f411/Makefile.features
rename to boards/nucleo-f411re/Makefile.features
diff --git a/boards/nucleo-f411/Makefile.include b/boards/nucleo-f411re/Makefile.include
similarity index 76%
rename from boards/nucleo-f411/Makefile.include
rename to boards/nucleo-f411re/Makefile.include
index c05ee3f9affc5c7caaa0f27b406e94038b346147..2bf49afce2dc4d1f71d212b1df61ac3dd95e6bb9 100644
--- a/boards/nucleo-f411/Makefile.include
+++ b/boards/nucleo-f411re/Makefile.include
@@ -1,4 +1,4 @@
-# define the cpu used by the nucleo-f411 board
+# define the cpu used by the nucleo-f411re board
 export CPU = stm32f4
 export CPU_MODEL = stm32f411re
 
diff --git a/boards/nucleo-f411/include/periph_conf.h b/boards/nucleo-f411re/include/periph_conf.h
similarity index 98%
rename from boards/nucleo-f411/include/periph_conf.h
rename to boards/nucleo-f411re/include/periph_conf.h
index 16be95323e21b5a7c25a55f587dd433bc3502ab8..60e7fa08a8c42c5d3c65f67b0ac7c30223b1190a 100644
--- a/boards/nucleo-f411/include/periph_conf.h
+++ b/boards/nucleo-f411re/include/periph_conf.h
@@ -7,13 +7,13 @@
  */
 
 /**
- * @defgroup    boards_nucleo-f411 STM32 Nucleo-F411
+ * @defgroup    boards_nucleo-f411re STM32 Nucleo-F411RE
  * @ingroup     boards_common_nucleo64
- * @brief       Support for the STM32 Nucleo-F411
+ * @brief       Support for the STM32 Nucleo-F411RE
  * @{
  *
  * @file
- * @name        Peripheral MCU configuration for the nucleo-f411 board
+ * @name        Peripheral MCU configuration for the nucleo-f411re board
  *
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
diff --git a/cpu/stm32f4/Makefile.features b/cpu/stm32f4/Makefile.features
index d4842c3edd6b0068b43571b4dcd527fae4df4c90..ded94857b9b2cd70c03184687433cdbbaab9d397 100644
--- a/cpu/stm32f4/Makefile.features
+++ b/cpu/stm32f4/Makefile.features
@@ -6,7 +6,7 @@ FEATURES_PROVIDED += periph_hwrng
 # CPU variable is available, we need to filter by board.
 #
 BOARDS_WITHOUT_HWRNG += nucleo-f401re
-BOARDS_WITHOUT_HWRNG += nucleo-f411
+BOARDS_WITHOUT_HWRNG += nucleo-f411re
 BOARDS_WITHOUT_HWRNG += nucleo-f446
 BOARDS_WITHOUT_HWRNG += nucleo144-f446
 
diff --git a/drivers/dsp0401/include/dsp0401_params.h b/drivers/dsp0401/include/dsp0401_params.h
index 60ffac77137fe8e3dd25ed7243a6ececd4fa4782..11fd96d5b17572d15f5680b79112e576f29485da 100644
--- a/drivers/dsp0401/include/dsp0401_params.h
+++ b/drivers/dsp0401/include/dsp0401_params.h
@@ -29,7 +29,7 @@ extern "C" {
 #endif
 
 /**
- * @name    Set default configuration parameters for the DSP0401 (for Nucleo-F411)
+ * @name    Set default configuration parameters for the DSP0401 (for Nucleo-F411RE)
  * @{
  */
 #ifndef DSP0401_PARAM_SDI_PIN
diff --git a/tests/pkg_fatfs/Makefile b/tests/pkg_fatfs/Makefile
index bc317a8d4112b6b723e39a7e478175d8f73db2c5..7cfb3e8114b4f0f1a1cead44b04f9a09228670e8 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-f401re nucleo-f410rb nucleo-f411 \
+                   nucleo-f303re nucleo-f334r8 nucleo-f401re nucleo-f410rb nucleo-f411re \
                    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 a351dab39ba9eb90fdad284c9ab55b379909eaab..772ac4ee205834b9b57d5c81916c6c5907ffd369 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-f401re nucleo-f410rb nucleo-f411 \
+                   nucleo-f303re nucleo-f334r8 nucleo-f401re nucleo-f410rb nucleo-f411re \
                    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_semtech-loramac/README.md b/tests/pkg_semtech-loramac/README.md
index 10aa0b5e02df6f7f69d43b198a3e21f6752685b0..9529d04d532bc5bc025a2feb2a8e4cea78962971 100644
--- a/tests/pkg_semtech-loramac/README.md
+++ b/tests/pkg_semtech-loramac/README.md
@@ -49,9 +49,9 @@ board.
 Depending on the type of radio device, set the `LORA_DRIVER` variable accordingly:
 For example:
 ```
-    LORA_DRIVER=sx1272 make BOARD=nucleo-f411 -C pkg/semtech-loramac flash term
+    LORA_DRIVER=sx1272 make BOARD=nucleo-f411re -C pkg/semtech-loramac flash term
 ```
-will build the application for a nucleo-f411 with an SX1272 based mbed LoRa shield.
+will build the application for a nucleo-f411re with an SX1272 based mbed LoRa shield.
 
 The SX1276 is the default value.
 
@@ -59,9 +59,9 @@ The other parameter that has to be set at build time is the geographic region:
 `EU868`, `US915`, etc. See LoRaWAN regional parameters for more information.
 
 ```
-    LORA_REGION=US915 LORA_DRIVER=sx1272 make BOARD=nucleo-f411 -C pkg/semtech-loramac flash term
+    LORA_REGION=US915 LORA_DRIVER=sx1272 make BOARD=nucleo-f411re -C pkg/semtech-loramac flash term
 ```
-will build the application for a nucleo-f411 with an SX1272 based mbed LoRa shield
+will build the application for a nucleo-f411re with an SX1272 based mbed LoRa shield
 for US915 region.
 
 The default region is `EU868`.
diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index 85a3a85f8062805097d6074f65d298deb7f8a139..e541d97e262f7fc7c1fe94137aea02a2bd797d56 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -140,7 +140,7 @@ ARM_CORTEX_M_BOARDS := airfy-beacon \
                        nucleo-f334r8 \
                        nucleo-f401re \
                        nucleo-f410rb \
-                       nucleo-f411 \
+                       nucleo-f411re \
                        nucleo-f446 \
                        nucleo-l053 \
                        nucleo-l073 \