diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html
index 939e7373cf5..eafbf6d9966 100644
--- a/Documentation/NuttShell.html
+++ b/Documentation/NuttShell.html
@@ -859,7 +859,7 @@ done
     <li>
       By default, the contents of rcS script are:
 <ul><pre>
-# Create a RAMDISK and mount it at XXXRDMOUNTPOUNTXXX
+# Create a RAMDISK and mount it at XXXRDMOUNTPOINTXXX
 
 mkrd -m 1 -s 512 1024
 mkfatfs /dev/ram1
@@ -3425,11 +3425,11 @@ set FOOBAR ABC_${FOO}_${BAR}
       By default, this <code>rcS</code> start-up script contains the following logic:
     </p>
 <ul><pre>
-# Create a RAMDISK and mount it at XXXRDMOUNTPOUNTXXX
+# Create a RAMDISK and mount it at XXXRDMOUNTPOINTXXX
 
 mkrd -m XXXMKRDMINORXXX -s XXMKRDSECTORSIZEXXX XXMKRDBLOCKSXXX
 mkfatfs /dev/ramXXXMKRDMINORXXX
-mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOUNTXXX
+mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOINTXXX
 </pre></ul>
 
     <p>
@@ -3451,7 +3451,7 @@ mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOUNTXXX
         </p>
       <li>
         <p>
-          <code>XXXRDMOUNTPOUNTXXX</code> will become the configured mount point.
+          <code>XXXRDMOUNTPOINTXXX</code> will become the configured mount point.
           Default: <code>/etc</code>
         </p>
     </ul>
diff --git a/configs/cc3200-launchpad/nsh/defconfig b/configs/cc3200-launchpad/nsh/defconfig
index c23f89145c2..68f0e9b5824 100644
--- a/configs/cc3200-launchpad/nsh/defconfig
+++ b/configs/cc3200-launchpad/nsh/defconfig
@@ -695,7 +695,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDOPT_DF_H=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_CMDOPT_HEXDUMP=y
-CONFIG_NSH_PROC_MOUNTPOUNT="/proc"
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=512
 
 #
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index 527c9c9be84..e72bb95933b 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -904,7 +904,7 @@ CONFIG_NSH_DISABLE_LOSETUP=y
 CONFIG_NSH_CMDOPT_DF_H=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_CMDOPT_HEXDUMP=y
-CONFIG_NSH_PROC_MOUNTPOUNT="/proc"
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=2048
 CONFIG_NSH_STRERROR=y
 
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index 54d3e5c1e18..552dfea8915 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -1284,7 +1284,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=128
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
-CONFIG_NSH_PROC_MOUNTPOUNT="/proc"
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=512
 
 #
diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig
index fd0c40234a6..aeb4bf4ded5 100644
--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@@ -1261,7 +1261,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=128
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
-CONFIG_NSH_PROC_MOUNTPOUNT="/proc"
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=512
 
 #
diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig
index 9ad1cdb0c31..313341935e9 100644
--- a/configs/stm32f429i-disco/extflash/defconfig
+++ b/configs/stm32f429i-disco/extflash/defconfig
@@ -892,7 +892,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDOPT_DF_H=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_CMDOPT_HEXDUMP=y
-CONFIG_NSH_PROC_MOUNTPOUNT="/proc"
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 # CONFIG_NSH_DISABLE_SEMICOLON is not set
diff --git a/configs/vsn/include/rcS.template b/configs/vsn/include/rcS.template
index 90fd10e613d..4860195bdc7 100755
--- a/configs/vsn/include/rcS.template
+++ b/configs/vsn/include/rcS.template
@@ -1,9 +1,9 @@
 echo "Versatile Sensor Node V1.2, www.netClamps.com"
 
-# Create a RAMDISK and mount it at XXXRDMOUNTPOUNTXXX
+# Create a RAMDISK and mount it at XXXRDMOUNTPOINTXXX
 #mkrd -m XXXMKRDMINORXXX -s XXMKRDSECTORSIZEXXX XXMKRDBLOCKSXXX
 #mkfatfs /dev/ramXXXMKRDMINORXXX
-#mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOUNTXXX
+#mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOINTXXX
 
 mount -t binfs /dev/ram0 /sbin
 
diff --git a/fs/mount/fs_foreachmountpoint.c b/fs/mount/fs_foreachmountpoint.c
index dd412a19eb1..b3ab33abc7b 100644
--- a/fs/mount/fs_foreachmountpoint.c
+++ b/fs/mount/fs_foreachmountpoint.c
@@ -51,7 +51,7 @@
 
 #include "inode/inode.h"
 
-#ifndef CONFIG_DISABLE_MOUNTPOUNT
+#ifndef CONFIG_DISABLE_MOUNTPOINT
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/include/nuttx/fs/fs.h b/include/nuttx/fs/fs.h
index ad05da5d704..b21d9cf802e 100644
--- a/include/nuttx/fs/fs.h
+++ b/include/nuttx/fs/fs.h
@@ -205,7 +205,7 @@ struct mountpt_operations
    * stats file stat(), file attributes, file truncation, etc.
    */
 };
-#endif /* CONFIG_DISABLE_MOUNTPOUNT */
+#endif /* CONFIG_DISABLE_MOUNTPOINT */
 
 /* Named OS resources are also maintained by the VFS.  This includes:
  *
@@ -224,7 +224,7 @@ struct mountpt_operations
 union inode_ops_u
 {
   FAR const struct file_operations      *i_ops;    /* Driver operations for inode */
-#ifndef CONFIG_DISABLE_MOUNTPOUNT
+#ifndef CONFIG_DISABLE_MOUNTPOINT
   FAR const struct block_operations     *i_bops;   /* Block driver operations */
   FAR const struct mountpt_operations   *i_mops;   /* Operations on a mountpoint */
 #endif
@@ -335,7 +335,7 @@ struct streamlist
  * pseudo-file system.
  */
 
-#ifndef CONFIG_DISABLE_MOUNTPOUNT
+#ifndef CONFIG_DISABLE_MOUNTPOINT
 struct statfs;                    /* Forward reference */
 typedef int (*foreach_mountpoint_t)(FAR const char *mountpoint,
                                     FAR struct statfs *statbuf,
@@ -388,7 +388,7 @@ void fs_initialize(void);
  *
  ****************************************************************************/
 
-#ifndef CONFIG_DISABLE_MOUNTPOUNT
+#ifndef CONFIG_DISABLE_MOUNTPOINT
 int foreach_mountpoint(foreach_mountpoint_t handler, FAR void *arg);
 #endif
 
diff --git a/tools/mkromfsimg.sh b/tools/mkromfsimg.sh
index 04ae501c69b..3950f468950 100755
--- a/tools/mkromfsimg.sh
+++ b/tools/mkromfsimg.sh
@@ -242,7 +242,7 @@ cat $rcstemplate | \
     sed -e "s,XXXMKRDMINORXXX,$fatdevno,g" | \
     sed -e "s,XXMKRDSECTORSIZEXXX,$fatsectsize,g" | \
     sed -e "s,XXMKRDBLOCKSXXX,$fatnsectors,g" | \
-    sed -e "s,XXXRDMOUNTPOUNTXXX,$fatmpt,g" >$rcsfile
+    sed -e "s,XXXRDMOUNTPOINTXXX,$fatmpt,g" >$rcsfile
 
 # And install it at the specified relative location