diff --git a/configs/samv71-xult/mxtxplnd/defconfig b/configs/samv71-xult/mxtxplnd/defconfig
index d0dd34f39ac..da5e717a274 100644
--- a/configs/samv71-xult/mxtxplnd/defconfig
+++ b/configs/samv71-xult/mxtxplnd/defconfig
@@ -590,7 +590,7 @@ CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
 # CONFIG_MTD_M25P is not set
-# CONFIG_MTD_ST25FL1 is not set
+# CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
diff --git a/configs/samv71-xult/netnsh/defconfig b/configs/samv71-xult/netnsh/defconfig
index 343928e393a..4bc4c811acd 100644
--- a/configs/samv71-xult/netnsh/defconfig
+++ b/configs/samv71-xult/netnsh/defconfig
@@ -562,7 +562,7 @@ CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
 # CONFIG_MTD_M25P is not set
-# CONFIG_MTD_ST25FL1 is not set
+# CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
diff --git a/configs/samv71-xult/nsh/defconfig b/configs/samv71-xult/nsh/defconfig
index ca29bca6891..62b3ee85cd6 100644
--- a/configs/samv71-xult/nsh/defconfig
+++ b/configs/samv71-xult/nsh/defconfig
@@ -545,7 +545,7 @@ CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
 # CONFIG_MTD_M25P is not set
-# CONFIG_MTD_ST25FL1 is not set
+# CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
diff --git a/configs/samv71-xult/nxwm/defconfig b/configs/samv71-xult/nxwm/defconfig
index ebad16bc11c..e1f54882955 100644
--- a/configs/samv71-xult/nxwm/defconfig
+++ b/configs/samv71-xult/nxwm/defconfig
@@ -593,7 +593,7 @@ CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
 # CONFIG_MTD_M25P is not set
-# CONFIG_MTD_ST25FL1 is not set
+# CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
diff --git a/configs/samv71-xult/src/sam_bringup.c b/configs/samv71-xult/src/sam_bringup.c
index ec44a81ae53..6e7df1dbd16 100644
--- a/configs/samv71-xult/src/sam_bringup.c
+++ b/configs/samv71-xult/src/sam_bringup.c
@@ -55,7 +55,7 @@
 
 #include "samv71-xult.h"
 
-#ifdef HAVE_ST25FL1
+#ifdef HAVE_S25FL1
 #include <nuttx/spi/qspi.h>
 #include <nuttx/mtd/mtd.h>
 #include "sam_qspi.h"
@@ -95,7 +95,7 @@
 
 int sam_bringup(void)
 {
-#ifdef HAVE_ST25FL1
+#ifdef HAVE_S25FL1
   FAR struct qspi_dev_s *qspi;
   FAR struct mtd_dev_s *mtd;
 #endif
@@ -188,7 +188,7 @@ int sam_bringup(void)
     }
 #endif
 
-#ifdef HAVE_ST25FL1
+#ifdef HAVE_S25FL1
   /* Create an instance of the SAMV71 QSPI device driver */
 
   qspi = sam_qspi_initialize(0);
@@ -199,13 +199,13 @@ int sam_bringup(void)
   else
     {
       /* Use the QSPI device instance to initialize the
-       * ST25FL1 device.
+       * S25FL1 device.
        */
 
-      mtd = st25fl1_initialize(qspi);
+      mtd = s25fl1_initialize(qspi);
       if (!mtd)
         {
-          SYSLOG("ERROR: st25fl1_initialize failed\n");
+          SYSLOG("ERROR: s25fl1_initialize failed\n");
         }
 
 #ifdef HAVE_SMARTFS
@@ -218,7 +218,7 @@ int sam_bringup(void)
         }
 
 #else
-      /* And now do what with the ST25FL1 MTD device? */
+      /* And now do what with the S25FL1 MTD device? */
 #  warning Missing Logic
 
 #endif
diff --git a/configs/samv71-xult/src/samv71-xult.h b/configs/samv71-xult/src/samv71-xult.h
index 7528158ddf5..0ba190ce37b 100644
--- a/configs/samv71-xult/src/samv71-xult.h
+++ b/configs/samv71-xult/src/samv71-xult.h
@@ -61,7 +61,7 @@
 #define HAVE_NETWORK     1
 #define HAVE_MACADDR     1
 #define HAVE_MTDCONFIG   1
-#define HAVE_ST25FL1     1
+#define HAVE_S25FL1      1
 #define HAVE_SMARTFS     1
 #define HAVE_WM8904      1
 #define HAVE_AUDIO_NULL  1
@@ -183,15 +183,15 @@
 #  undef HAVE_MTDCONFIG
 #endif
 
-/* ST25FL1 QuadSPI FLASH */
+/* S25FL1 QuadSPI FLASH */
 
-#ifndef CONFIG_MTD_ST25FL1
-#  undef HAVE_ST25FL1
+#ifndef CONFIG_MTD_S25FL1
+#  undef HAVE_S25FL1
 #  undef HAVE_SMARTFS
 #endif
 
 #ifndef CONFIG_SAMV7_QSPI
-#  undef HAVE_ST25FL1
+#  undef HAVE_S25FL1
 #  undef HAVE_SMARTFS
 #endif