diff --git a/configs/mikroe-stm32f4/src/stm32_appinit.c b/configs/mikroe-stm32f4/src/stm32_appinit.c
index 7d43cf72ed2..5cb5d176651 100644
--- a/configs/mikroe-stm32f4/src/stm32_appinit.c
+++ b/configs/mikroe-stm32f4/src/stm32_appinit.c
@@ -61,7 +61,7 @@
 
 #ifdef CONFIG_MIKROE_FLASH_CONFIG_PART
 #ifdef CONFIG_PLATFORM_CONFIGDATA
-#  include <nuttx/configdata.h>
+#  include <nuttx/mtd/configdata.h>
 #endif
 #endif
 
diff --git a/configs/same70-xplained/src/sam_at24config.c b/configs/same70-xplained/src/sam_at24config.c
index 69d27a02ced..74eea58ee4c 100644
--- a/configs/same70-xplained/src/sam_at24config.c
+++ b/configs/same70-xplained/src/sam_at24config.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/configdata.h>
+#include <nuttx/mtd/configdata.h>
 #include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/ioctl.h>
 
diff --git a/configs/samv71-xult/src/sam_at24config.c b/configs/samv71-xult/src/sam_at24config.c
index 4a324ac07be..af13bf34fa5 100644
--- a/configs/samv71-xult/src/sam_at24config.c
+++ b/configs/samv71-xult/src/sam_at24config.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/configdata.h>
+#include <nuttx/mtd/configdata.h>
 #include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/ioctl.h>
 
diff --git a/configs/stm32f429i-disco/src/stm32_appinit.c b/configs/stm32f429i-disco/src/stm32_appinit.c
index 415884fa5bf..26b92f3e4cc 100644
--- a/configs/stm32f429i-disco/src/stm32_appinit.c
+++ b/configs/stm32f429i-disco/src/stm32_appinit.c
@@ -65,7 +65,7 @@
 
 #ifdef CONFIG_STM32F429I_DISCO_FLASH_CONFIG_PART
 #ifdef CONFIG_PLATFORM_CONFIGDATA
-#  include <nuttx/configdata.h>
+#  include <nuttx/mtd/configdata.h>
 #endif
 #endif
 
diff --git a/drivers/mtd/mtd_config.c b/drivers/mtd/mtd_config.c
index 6bfe0d7fc6f..35131461c65 100644
--- a/drivers/mtd/mtd_config.c
+++ b/drivers/mtd/mtd_config.c
@@ -61,7 +61,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd/mtd.h>
-#include <nuttx/configdata.h>
+#include <nuttx/mtd/configdata.h>
 
 #ifdef CONFIG_MTD_CONFIG
 
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 5b61b2db904..53ef72c3cb5 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -2060,6 +2060,6 @@ config PSEUDOTERM_TXBUFSIZE
 	int "Pseudo-Terminal Tx buffer size"
 	default 256
 	---help---
-		Slave-to-master buffer size.  Default: 256
+		Slave-to-master pipe buffer size.  Default: 256
 
 endif # PSEUDOTERM
diff --git a/include/nuttx/configdata.h b/include/nuttx/mtd/configdata.h
similarity index 96%
rename from include/nuttx/configdata.h
rename to include/nuttx/mtd/configdata.h
index 60539993aae..65965c61959 100644
--- a/include/nuttx/configdata.h
+++ b/include/nuttx/mtd/configdata.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/configdata.h
+ * include/nuttx/mtd/configdata.h
  *
  *   Copyright (C) 2013 Ken Pettit. All rights reserved.
  *   Author: Ken Pettit <pettitkd@gmail.com>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_CONFIGDATA_H
-#define __INCLUDE_NUTTX_CONFIGDATA_H
+#ifndef __INCLUDE_NUTTX_MTD_CONFIGDATA_H
+#define __INCLUDE_NUTTX_MTD_CONFIGDATA_H
 
 /* The configdata device details kernel level services for providing
  * application config data from kernel control objects, such as partitions
@@ -133,4 +133,4 @@ int mtdconfig_register(FAR struct mtd_dev_s *mtd);
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_CONFIGDATA_H */
+#endif /* __INCLUDE_NUTTX_MTD_CONFIGDATA_H */