diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 06c102016a6..9283f32078b 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -103,9 +103,9 @@ CONFIG_UART_PARITY=0
 CONFIG_UART_2STOP=0
 
 #
-# MP25x Configuration
+# M25Px Configuration
 #
-CONFIG_MP25P_SPIMODE=3
+CONFIG_M25P_SPIMODE=3
 
 #
 # General build options
diff --git a/configs/mikroe-stm32f4/src/up_nsh.c b/configs/mikroe-stm32f4/src/up_nsh.c
index 179d0eab08a..e92a02e8385 100644
--- a/configs/mikroe-stm32f4/src/up_nsh.c
+++ b/configs/mikroe-stm32f4/src/up_nsh.c
@@ -51,7 +51,7 @@
 #  include <nuttx/mmcsd.h>
 #endif
 
-#ifdef CONFIG_MTD_MP25P
+#ifdef CONFIG_MTD_M25P
 #  include <nuttx/mtd.h>
 #endif
 
diff --git a/configs/mikroe-stm32f4/src/up_spi.c b/configs/mikroe-stm32f4/src/up_spi.c
index 07c5ecef471..08fa89a9c09 100644
--- a/configs/mikroe-stm32f4/src/up_spi.c
+++ b/configs/mikroe-stm32f4/src/up_spi.c
@@ -102,7 +102,7 @@ void weak_function stm32_spiinitialize(void)
 {
 #ifdef CONFIG_STM32_SPI3
 
-#ifdef CONFIG_MTD_MP25P
+#ifdef CONFIG_MTD_M25P
   (void)stm32_configgpio(GPIO_CS_FLASH);    /* FLASH chip select */
   stm32_gpiowrite(GPIO_CS_FLASH, 1);        /* Ensure the CS is inactive */
 #endif
@@ -155,7 +155,7 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
-#if defined(CONFIG_MTD_MP25P)
+#if defined(CONFIG_MTD_M25P)
   if (devid == SPIDEV_FLASH)
     {
       stm32_gpiowrite(GPIO_CS_FLASH, !selected);
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index ec42222b684..29e948be5f5 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -417,12 +417,12 @@ CONFIG_RAMMTD_ERASESTATE=0xff
 CONFIG_RAMMTD_SMART=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT45DB is not set
-CONFIG_MTD_MP25P=y
-CONFIG_MP25P_SPIMODE=0
-CONFIG_MP25P_MANUFACTURER=0x1C
-CONFIG_MP25P_MEMORY_TYPE=0x31
-CONFIG_MP25P_SUBSECTOR_ERASE=y
-CONFIG_MP25P_BYTEWRITE=y
+CONFIG_MTD_M25P=y
+CONFIG_M25P_SPIMODE=0
+CONFIG_M25P_MANUFACTURER=0x1C
+CONFIG_M25P_MEMORY_TYPE=0x31
+CONFIG_M25P_SUBSECTOR_ERASE=y
+CONFIG_M25P_BYTEWRITE=y
 CONFIG_MTD_SMART=y
 CONFIG_MTD_SMART_SECTOR_SIZE=512
 # CONFIG_MTD_RAMTRON is not set
diff --git a/configs/sim/mtdpart/defconfig b/configs/sim/mtdpart/defconfig
index e35f72438fa..f17ec1b545d 100644
--- a/configs/sim/mtdpart/defconfig
+++ b/configs/sim/mtdpart/defconfig
@@ -214,7 +214,7 @@ CONFIG_RAMMTD_ERASESTATE=0xff
 CONFIG_RAMMTD_FLASHSIM=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT45DB is not set
-# CONFIG_MTD_MP25P is not set
+# CONFIG_MTD_M25P is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST39FV is not set
diff --git a/configs/sim/nxffs/defconfig b/configs/sim/nxffs/defconfig
index 098ad29d396..09c233643a8 100644
--- a/configs/sim/nxffs/defconfig
+++ b/configs/sim/nxffs/defconfig
@@ -214,7 +214,7 @@ CONFIG_RAMMTD_ERASESTATE=0xff
 CONFIG_RAMMTD_FLASHSIM=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT45DB is not set
-# CONFIG_MTD_MP25P is not set
+# CONFIG_MTD_M25P is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST39FV is not set