diff --git a/configs/Kconfig b/configs/Kconfig
index 7bcec3f205..2fc7e05bc9 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -1162,8 +1162,8 @@ config ARCH_BOARD_STM3240G_EVAL
 		microcontroller (ARM Cortex-M4 with FPU).  This port uses a GNU Cortex-M4
 		toolchain (such as CodeSourcery).
 
-config ARCH_BOARD_STM32F0_DISCOVERY
-	bool "STMicro STM32F0-Discovery board"
+config ARCH_BOARD_STM32F051_DISCOVERY
+	bool "STMicro STM32F051-Discovery board"
 	depends on ARCH_CHIP_STM32F051R8
 	select ARCH_HAVE_LEDS
 	select ARCH_HAVE_BUTTONS
@@ -1686,7 +1686,7 @@ config ARCH_BOARD
 	default "photon"                   if ARCH_BOARD_PHOTON
 	default "stm32butterfly2"          if ARCH_BOARD_STM32_BUTTERFLY2
 	default "stm32_tiny"               if ARCH_BOARD_STM32_TINY
-	default "stm32f0discovery"         if ARCH_BOARD_STM32F0_DISCOVERY
+	default "stm32f051-discovery"      if ARCH_BOARD_STM32F051_DISCOVERY
 	default "stm32f103-minimum"        if ARCH_BOARD_STM32F103_MINIMUM
 	default "stm3210e-eval"            if ARCH_BOARD_STM3210E_EVAL
 	default "stm3220g-eval"            if ARCH_BOARD_STM3220G_EVAL
@@ -2078,8 +2078,8 @@ endif
 if ARCH_BOARD_STM32_TINY
 source "configs/stm32_tiny/Kconfig"
 endif
-if ARCH_BOARD_STM32F0_DISCOVERY
-source "configs/stm32f0discovery/Kconfig"
+if ARCH_BOARD_STM32F051_DISCOVERY
+source "configs/stm32f051-discovery/Kconfig"
 endif
 if ARCH_BOARD_STM32F103_MINIMUM
 source "configs/stm32f103-minimum/Kconfig"
diff --git a/configs/README.txt b/configs/README.txt
index aa0b985205..ae6b2ad796 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -674,8 +674,8 @@ configs/stm32butterfly2
   Kamami stm32butterfly2 development board with optional ETH phy.  See
   https://kamami.pl/zestawy-uruchomieniowe-stm32/178507-stm32butterfly2.html
 
-configs/stm32f0discovery
-  STMicro STM32F-Discovery board based on the STMicro ARCH_CHIP_STM32F051R8
+configs/stm32f051-discovery
+  STMicro STM32F051-Discovery board based on the STMicro ARCH_CHIP_STM32F051R8
   MCU.
 
 configs/stm32f103-minimum
diff --git a/configs/stm32f0discovery/Kconfig b/configs/stm32f051-discovery/Kconfig
similarity index 80%
rename from configs/stm32f0discovery/Kconfig
rename to configs/stm32f051-discovery/Kconfig
index f1776ced8b..f79b365f7b 100644
--- a/configs/stm32f0discovery/Kconfig
+++ b/configs/stm32f051-discovery/Kconfig
@@ -3,6 +3,6 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-if ARCH_BOARD_STM32F0_DISCOVERY
+if ARCH_BOARD_STM32F051_DISCOVERY
 
 endif
diff --git a/configs/stm32f0discovery/README.txt b/configs/stm32f051-discovery/README.txt
similarity index 100%
rename from configs/stm32f0discovery/README.txt
rename to configs/stm32f051-discovery/README.txt
diff --git a/configs/stm32f0discovery/include/board.h b/configs/stm32f051-discovery/include/board.h
similarity index 98%
rename from configs/stm32f0discovery/include/board.h
rename to configs/stm32f051-discovery/include/board.h
index a29d0c95f9..412a3e7299 100644
--- a/configs/stm32f0discovery/include/board.h
+++ b/configs/stm32f051-discovery/include/board.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/stm32f0discovery/include/board.h
+ * configs/stm32f051-discovery/include/board.h
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __CONFIG_STM32F0DISCOVERY_INCLUDE_BOARD_H
-#define __CONFIG_STM32F0DISCOVERY_INCLUDE_BOARD_H
+#ifndef __CONFIG_STM32F051_DISCOVERY_INCLUDE_BOARD_H
+#define __CONFIG_STM32F051_DISCOVERY_INCLUDE_BOARD_H
 
 /************************************************************************************
  * Included Files
@@ -244,4 +244,4 @@
 #define GPIO_I2C1_SCL            GPIO_I2C1_SCL_1
 #define GPIO_I2C1_SDA            GPIO_I2C1_SDA_1
 
-#endif  /* __CONFIG_STM32F0DISCOVERY_INCLUDE_BOARD_H */
+#endif  /* __CONFIG_STM32F051_DISCOVERY_INCLUDE_BOARD_H */
diff --git a/configs/stm32f0discovery/nsh/defconfig b/configs/stm32f051-discovery/nsh/defconfig
similarity index 94%
rename from configs/stm32f0discovery/nsh/defconfig
rename to configs/stm32f051-discovery/nsh/defconfig
index b7bb3c1ccf..1fd28ffcd7 100644
--- a/configs/stm32f0discovery/nsh/defconfig
+++ b/configs/stm32f051-discovery/nsh/defconfig
@@ -4,8 +4,8 @@
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_XD is not set
 # CONFIG_NSH_DISABLEBG is not set
-CONFIG_ARCH_BOARD_STM32F0_DISCOVERY=y
-CONFIG_ARCH_BOARD="stm32f0discovery"
+CONFIG_ARCH_BOARD_STM32F051_DISCOVERY=y
+CONFIG_ARCH_BOARD="stm32f051-discovery"
 CONFIG_ARCH_CHIP_STM32F0=y
 CONFIG_ARCH_CHIP_STM32F051R8=y
 CONFIG_ARCH_STACKDUMP=y
diff --git a/configs/stm32f0discovery/scripts/Make.defs b/configs/stm32f051-discovery/scripts/Make.defs
similarity index 98%
rename from configs/stm32f0discovery/scripts/Make.defs
rename to configs/stm32f051-discovery/scripts/Make.defs
index 55c03a125f..f6582afc8a 100644
--- a/configs/stm32f0discovery/scripts/Make.defs
+++ b/configs/stm32f051-discovery/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/stm32f0discovery/scripts/Make.defs
+# configs/stm32f051-discovery/scripts/Make.defs
 #
 #   Copyright (C) 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f0discovery/scripts/flash.ld b/configs/stm32f051-discovery/scripts/flash.ld
similarity index 98%
rename from configs/stm32f0discovery/scripts/flash.ld
rename to configs/stm32f051-discovery/scripts/flash.ld
index 2996e3017a..7af2a63937 100644
--- a/configs/stm32f0discovery/scripts/flash.ld
+++ b/configs/stm32f051-discovery/scripts/flash.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32f0discovery/scripts/flash.ld
+ * configs/stm32f051-discovery/scripts/flash.ld
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f0discovery/scripts/gnu-elf.ld b/configs/stm32f051-discovery/scripts/gnu-elf.ld
similarity index 98%
rename from configs/stm32f0discovery/scripts/gnu-elf.ld
rename to configs/stm32f051-discovery/scripts/gnu-elf.ld
index 7361e546da..6eec6eca23 100644
--- a/configs/stm32f0discovery/scripts/gnu-elf.ld
+++ b/configs/stm32f051-discovery/scripts/gnu-elf.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32f0discovery/scripts/gnu-elf.ld
+ * configs/stm32f051-discovery/scripts/gnu-elf.ld
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f0discovery/src/.gitignore b/configs/stm32f051-discovery/src/.gitignore
similarity index 100%
rename from configs/stm32f0discovery/src/.gitignore
rename to configs/stm32f051-discovery/src/.gitignore
diff --git a/configs/stm32f0discovery/src/Makefile b/configs/stm32f051-discovery/src/Makefile
similarity index 98%
rename from configs/stm32f0discovery/src/Makefile
rename to configs/stm32f051-discovery/src/Makefile
index 585d6dce80..24959f597f 100644
--- a/configs/stm32f0discovery/src/Makefile
+++ b/configs/stm32f051-discovery/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/stm32f0discovery/src/Makefile
+# configs/stm32f051-discovery/src/Makefile
 #
 #   Copyright (C) 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f0discovery/src/stm32_appinit.c b/configs/stm32f051-discovery/src/stm32_appinit.c
similarity index 97%
rename from configs/stm32f0discovery/src/stm32_appinit.c
rename to configs/stm32f051-discovery/src/stm32_appinit.c
index 3a0ae46ab2..729fec987c 100644
--- a/configs/stm32f0discovery/src/stm32_appinit.c
+++ b/configs/stm32f051-discovery/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/stm32f0discovery/src/stm32_appinit.c
+ * config/stm32f051-discovery/src/stm32_appinit.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +44,7 @@
 
 #include <nuttx/board.h>
 
-#include "stm32f0discovery.h"
+#include "stm32f051-discovery.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/configs/stm32f0discovery/src/stm32_autoleds.c b/configs/stm32f051-discovery/src/stm32_autoleds.c
similarity index 98%
rename from configs/stm32f0discovery/src/stm32_autoleds.c
rename to configs/stm32f051-discovery/src/stm32_autoleds.c
index 1627bf2e25..529dee5978 100644
--- a/configs/stm32f0discovery/src/stm32_autoleds.c
+++ b/configs/stm32f051-discovery/src/stm32_autoleds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32f0discovery/src/stm32_autoleds.c
+ * configs/stm32f051-discovery/src/stm32_autoleds.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "stm32f0discovery.h"
+#include "stm32f051-discovery.h"
 
 #ifdef CONFIG_ARCH_LEDS
 
diff --git a/configs/stm32f0discovery/src/stm32_boot.c b/configs/stm32f051-discovery/src/stm32_boot.c
similarity index 97%
rename from configs/stm32f0discovery/src/stm32_boot.c
rename to configs/stm32f051-discovery/src/stm32_boot.c
index 5c04acd03f..8fac2ab07c 100644
--- a/configs/stm32f0discovery/src/stm32_boot.c
+++ b/configs/stm32f051-discovery/src/stm32_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/stm32f0discovery/src/stm32f0_boot.c
+ * configs/stm32f051-discovery/src/stm32f0_boot.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "stm32f0discovery.h"
+#include "stm32f051-discovery.h"
 
 /************************************************************************************
  * Public Functions
diff --git a/configs/stm32f0discovery/src/stm32_bringup.c b/configs/stm32f051-discovery/src/stm32_bringup.c
similarity index 97%
rename from configs/stm32f0discovery/src/stm32_bringup.c
rename to configs/stm32f051-discovery/src/stm32_bringup.c
index 61003b54f8..fe0ca8b1d4 100644
--- a/configs/stm32f0discovery/src/stm32_bringup.c
+++ b/configs/stm32f051-discovery/src/stm32_bringup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/stm32f0discovery/src/stm32_bringup.c
+ * config/stm32f051-discovery/src/stm32_bringup.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -42,7 +42,7 @@
 #include <sys/mount.h>
 #include <sys/types.h>
 
-#include "stm32f0discovery.h"
+#include "stm32f051-discovery.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/configs/stm32f0discovery/src/stm32_buttons.c b/configs/stm32f051-discovery/src/stm32_buttons.c
similarity index 98%
rename from configs/stm32f0discovery/src/stm32_buttons.c
rename to configs/stm32f051-discovery/src/stm32_buttons.c
index 1bcc3b5e54..3a40faf675 100644
--- a/configs/stm32f0discovery/src/stm32_buttons.c
+++ b/configs/stm32f051-discovery/src/stm32_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32f0discovery/src/board_buttons.c
+ * configs/stm32f051-discovery/src/board_buttons.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -47,7 +47,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "stm32f0discovery.h"
+#include "stm32f051-discovery.h"
 
 #ifdef CONFIG_ARCH_BUTTONS
 
diff --git a/configs/stm32f0discovery/src/stm32_userleds.c b/configs/stm32f051-discovery/src/stm32_userleds.c
similarity index 97%
rename from configs/stm32f0discovery/src/stm32_userleds.c
rename to configs/stm32f051-discovery/src/stm32_userleds.c
index 1478c7375c..fd9d1520e8 100644
--- a/configs/stm32f0discovery/src/stm32_userleds.c
+++ b/configs/stm32f051-discovery/src/stm32_userleds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32f0discovery/src/stm32_userleds.c
+ * configs/stm32f051-discovery/src/stm32_userleds.c
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
 
 #include "chip.h"
 #include "stm32.h"
-#include "stm32f0discovery.h"
+#include "stm32f051-discovery.h"
 
 #ifndef CONFIG_ARCH_LEDS
 
diff --git a/configs/stm32f0discovery/src/stm32f0discovery.h b/configs/stm32f051-discovery/src/stm32f051-discovery.h
similarity index 95%
rename from configs/stm32f0discovery/src/stm32f0discovery.h
rename to configs/stm32f051-discovery/src/stm32f051-discovery.h
index fca605e006..ab5de94253 100644
--- a/configs/stm32f0discovery/src/stm32f0discovery.h
+++ b/configs/stm32f051-discovery/src/stm32f051-discovery.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * configs/stm32f0discovery/src/stm32f0discovery.h
+ * configs/stm32f051-discovery/src/stm32f051-discovery.h
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __CONFIGS_STM32F0DISCOVERY_SRC_STM32F0DISCOVERY_H
-#define __CONFIGS_STM32F0DISCOVERY_SRC_STM32F0DISCOVERY_H
+#ifndef __CONFIGS_STM32F051_DISCOVERY_SRC_STM32F051_DISCOVERY_H
+#define __CONFIGS_STM32F051_DISCOVERY_SRC_STM32F051_DISCOVERY_H
 
 /****************************************************************************************************
  * Included Files
@@ -132,4 +132,4 @@
 int stm32_bringup(void);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CONFIGS_STM32F0DISCOVERY_SRC_STM32F0DISCOVERY_H */
+#endif /* __CONFIGS_STM32F051_DISCOVERY_SRC_STM32F051_DISCOVERY_H */