diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index ed94849e79..63b2dc864d 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -2596,7 +2596,7 @@ build
   <li>
     <code>CONFIG_PAGING_M25PX</code>:
     Use the m25px.c FLASH driver.
-	If this is selected, then the MTD interface to the MP25x device will be used to support paging.
+	If this is selected, then the MTD interface to the M25Px device will be used to support paging.
   </li>
   <li>
     <code>CONFIG_PAGING_M25PX_BINOFFSET</code>:
diff --git a/ReleaseNotes b/ReleaseNotes
index dbfda36bb1..8120cf14f5 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1265,7 +1265,7 @@ for existing NuttX ports:
     4-bpp greyscale support was integrated into the NX graphics sub-system and
     verified using the TI/Luminary LP3S6965 Ethernet Evaluation Kit.
 
-  * The MP25Px driver was extended for the M24P1 FLASH part (see NOTE).
+  * The M25Px driver was extended for the M24P1 FLASH part (see NOTE).
 
   * An I2C driver and (basic) SPI driver were added for the NXP LPC313x port.
     The I2C interface definition was extended to efficiently handle multiple I2C
diff --git a/configs/README.txt b/configs/README.txt
index 1216de9d94..66111d791b 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -421,7 +421,7 @@ defconfig -- This is a configuration file similar to the Linux
 		  CONFIG_PAGING_SDSLOT will instruct certain board-specific logic to
 		  initialize the media in this SD slot.
 		CONFIG_PAGING_M25PX - Use the m25px.c FLASH driver.  If this is selected,
-		  then the MTD interface to the MP25x device will be used to support
+		  then the MTD interface to the M25Px device will be used to support
 		  paging.
 		CONFIG_PAGING_M25PX_BINOFFSET - If CONFIG_PAGING_M25PX is defined then
 		  CONFIG_PAGING_M25PX_BINOFFSET will be used to specify the offset
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 87e06dc367..17e8ae0757 100755
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -425,7 +425,7 @@ CONFIG_SIG_SIGWORK=4
 #   CONFIG_PAGING_SDSLOT will instruct certain board-specific logic to
 #   initialize the media in this SD slot.
 # CONFIG_PAGING_M25PX - Use the m25px.c FLASH driver.  If this is selected,
-#   then the MTD interface to the MP25x device will be used to support
+#   then the MTD interface to the M25Px device will be used to support
 #   paging.
 # CONFIG_PAGING_M25PX_BINOFFSET - If CONFIG_PAGING_M25PX is defined then
 #   CONFIG_PAGING_M25PX_BINOFFSET will be used to specify the offset
@@ -456,7 +456,7 @@ CONFIG_PAGING_BLOCKINGFILL=y
 CONFIG_PAGING_MOUNTPT="/mnt/pgsrc"
 CONFIG_PAGING_MINOR=0
 CONFIG_PAGING_SDSLOT=0
-CONFIG_PAGING_M25PX=y
+CONFIG_PAGING_M25PX=n
 CONFIG_PAGING_M25PX_BINOFFSET=0
 CONFIG_PAGING_M25PX_SPIPORT=0
 
diff --git a/configs/ea3131/src/up_fillpage.c b/configs/ea3131/src/up_fillpage.c
index 6aa7b7602f..6058095d30 100755
--- a/configs/ea3131/src/up_fillpage.c
+++ b/configs/ea3131/src/up_fillpage.c
@@ -188,7 +188,7 @@ struct pg_source_s
   bool initialized;  /* TRUE: we are initialized */
 #endif
 
-  /* This is the MP25P* device state structure */
+  /* This is the M25P* device state structure */
 
   FAR struct mtd_dev_s *mtd;
 
@@ -435,7 +435,7 @@ int up_fillpage(FAR _TCB *tcb, FAR void *vpage)
 #elif defined(CONFIG_PAGING_M25PX) /* !CONFIG_PAGING_BINPATH */
 
   /* If CONFIG_PAGING_M25PX is defined, use the m25px.c FLASH driver.  If this
-   * is selected, then the MTD interface to the MP25x device will be used to
+   * is selected, then the MTD interface to the M25Px device will be used to
    * support paging.
    *
    * If the driver is configured to use interrupts or DMA, then it must be
@@ -524,7 +524,7 @@ void weak_function lpc313x_pginitialize(void)
 #elif defined(CONFIG_PAGING_M25PX)
 
   /* If CONFIG_PAGING_M25PX is defined, use the m25px.c FLASH driver.  If this
-   * is selected, then the MTD interface to the MP25x device will be used to
+   * is selected, then the MTD interface to the M25Px device will be used to
    * support paging.
    *
    * If the driver is not configured to use interrupts or DMA, then it is