diff --git a/arch/arm/src/a1x/a1x_boot.c b/arch/arm/src/a1x/a1x_boot.c
index 321eb1d18f..c999ea6ef5 100644
--- a/arch/arm/src/a1x/a1x_boot.c
+++ b/arch/arm/src/a1x/a1x_boot.c
@@ -88,7 +88,7 @@ extern uint32_t _vector_start; /* Beginning of vector block */
 extern uint32_t _vector_end;   /* End+1 of vector block */
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /* This table describes how to map a set of 1Mb pages to space the physical
diff --git a/arch/arm/src/a1x/a1x_lowputc.c b/arch/arm/src/a1x/a1x_lowputc.c
index ccf43d6028..0018c88881 100644
--- a/arch/arm/src/a1x/a1x_lowputc.c
+++ b/arch/arm/src/a1x/a1x_lowputc.c
@@ -179,7 +179,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c
index 225ce8bb62..b6e536fdc6 100644
--- a/arch/arm/src/a1x/a1x_serial.c
+++ b/arch/arm/src/a1x/a1x_serial.c
@@ -143,7 +143,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/arm/up_fullcontextrestore.S b/arch/arm/src/arm/up_fullcontextrestore.S
index b1cdf581af..50fdd745dd 100644
--- a/arch/arm/src/arm/up_fullcontextrestore.S
+++ b/arch/arm/src/arm/up_fullcontextrestore.S
@@ -57,7 +57,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Private Variables
+ * Private Data
  **************************************************************************/
 
 /**************************************************************************
diff --git a/arch/arm/src/arm/up_saveusercontext.S b/arch/arm/src/arm/up_saveusercontext.S
index 49577d31e3..bb812e53a2 100644
--- a/arch/arm/src/arm/up_saveusercontext.S
+++ b/arch/arm/src/arm/up_saveusercontext.S
@@ -57,7 +57,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Private Variables
+ * Private Data
  **************************************************************************/
 
 /**************************************************************************
diff --git a/arch/arm/src/armv7-m/up_ramvec_attach.c b/arch/arm/src/armv7-m/up_ramvec_attach.c
index f6e20c2cb6..3700cdb00b 100644
--- a/arch/arm/src/armv7-m/up_ramvec_attach.c
+++ b/arch/arm/src/armv7-m/up_ramvec_attach.c
@@ -75,7 +75,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/armv7-m/up_ramvec_initialize.c b/arch/arm/src/armv7-m/up_ramvec_initialize.c
index 56989441ee..80b176d674 100644
--- a/arch/arm/src/armv7-m/up_ramvec_initialize.c
+++ b/arch/arm/src/armv7-m/up_ramvec_initialize.c
@@ -109,7 +109,7 @@ up_vector_t g_ram_vectors[ARMV7M_VECTAB_SIZE]
   __attribute__ ((section (".ram_vectors"), aligned (RAMVEC_ALIGN)));
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/c5471/c5471_lowputc.S b/arch/arm/src/c5471/c5471_lowputc.S
index 0c2af49e16..29453f1081 100644
--- a/arch/arm/src/c5471/c5471_lowputc.S
+++ b/arch/arm/src/c5471/c5471_lowputc.S
@@ -60,7 +60,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Private Variables
+ * Private Data
  **************************************************************************/
 
 /**************************************************************************
diff --git a/arch/arm/src/c5471/c5471_serial.c b/arch/arm/src/c5471/c5471_serial.c
index 55cf918f18..935bc46871 100644
--- a/arch/arm/src/c5471/c5471_serial.c
+++ b/arch/arm/src/c5471/c5471_serial.c
@@ -119,7 +119,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/calypso/calypso_lowputc.S b/arch/arm/src/calypso/calypso_lowputc.S
index 1a6e5e8391..5556b3baca 100644
--- a/arch/arm/src/calypso/calypso_lowputc.S
+++ b/arch/arm/src/calypso/calypso_lowputc.S
@@ -64,7 +64,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Private Variables
+ * Private Data
  **************************************************************************/
 
 /**************************************************************************
diff --git a/arch/arm/src/calypso/calypso_serial.c b/arch/arm/src/calypso/calypso_serial.c
index 344070aaca..0c4a44c0c1 100644
--- a/arch/arm/src/calypso/calypso_serial.c
+++ b/arch/arm/src/calypso/calypso_serial.c
@@ -135,7 +135,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/dm320/dm320_boot.c b/arch/arm/src/dm320/dm320_boot.c
index 13f64b3ff7..4ba55ac172 100644
--- a/arch/arm/src/dm320/dm320_boot.c
+++ b/arch/arm/src/dm320/dm320_boot.c
@@ -67,7 +67,7 @@ extern uint32_t _vector_start; /* Beginning of vector block */
 extern uint32_t _vector_end;   /* End+1 of vector block */
 
 /************************************************************************************
- * Private Variables
+ * Private Data
  ************************************************************************************/
 
 static const struct section_mapping_s section_mapping[] =
diff --git a/arch/arm/src/dm320/dm320_lowputc.S b/arch/arm/src/dm320/dm320_lowputc.S
index 83abf7fab8..8df578bb33 100644
--- a/arch/arm/src/dm320/dm320_lowputc.S
+++ b/arch/arm/src/dm320/dm320_lowputc.S
@@ -61,7 +61,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Private Variables
+ * Private Data
  **************************************************************************/
 
 /**************************************************************************
diff --git a/arch/arm/src/dm320/dm320_serial.c b/arch/arm/src/dm320/dm320_serial.c
index 2b840ab812..dcceafb28a 100644
--- a/arch/arm/src/dm320/dm320_serial.c
+++ b/arch/arm/src/dm320/dm320_serial.c
@@ -100,7 +100,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c
index cf6ba14d2b..e57af78353 100644
--- a/arch/arm/src/efm32/efm32_leserial.c
+++ b/arch/arm/src/efm32/efm32_leserial.c
@@ -180,7 +180,7 @@ static bool efm32_txready(struct uart_dev_s *dev);
 static bool efm32_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_leuart_ops =
diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c
index f393f17c83..7dcc933773 100644
--- a/arch/arm/src/efm32/efm32_serial.c
+++ b/arch/arm/src/efm32/efm32_serial.c
@@ -299,7 +299,7 @@ static bool efm32_txready(struct uart_dev_s *dev);
 static bool efm32_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/imx/imx_boot.c b/arch/arm/src/imx/imx_boot.c
index 71bf743e3f..82a8e4fb54 100644
--- a/arch/arm/src/imx/imx_boot.c
+++ b/arch/arm/src/imx/imx_boot.c
@@ -70,7 +70,7 @@ extern uint32_t _vector_start; /* Beginning of vector block */
 extern uint32_t _vector_end;   /* End+1 of vector block */
 
 /************************************************************************************
- * Private Variables
+ * Private Data
  ************************************************************************************/
 
 /* Mapping of the external memory regions will probably have to be made board
diff --git a/arch/arm/src/imx/imx_lowputc.S b/arch/arm/src/imx/imx_lowputc.S
index 09aa4562fa..e2cfc8d155 100644
--- a/arch/arm/src/imx/imx_lowputc.S
+++ b/arch/arm/src/imx/imx_lowputc.S
@@ -61,7 +61,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Private Variables
+ * Private Data
  **************************************************************************/
 
 /**************************************************************************
diff --git a/arch/arm/src/imx/imx_serial.c b/arch/arm/src/imx/imx_serial.c
index c134c13495..8eaa8460e5 100644
--- a/arch/arm/src/imx/imx_serial.c
+++ b/arch/arm/src/imx/imx_serial.c
@@ -122,7 +122,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/kinetis/kinetis_lowputc.c b/arch/arm/src/kinetis/kinetis_lowputc.c
index 13aaa258e9..bd3b27a876 100644
--- a/arch/arm/src/kinetis/kinetis_lowputc.c
+++ b/arch/arm/src/kinetis/kinetis_lowputc.c
@@ -112,7 +112,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /* This array maps an encoded FIFO depth (index) to the actual size of the
diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c
index 42052c6a7d..550ff55917 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -266,7 +266,7 @@ static bool up_txempty(struct uart_dev_s *dev);
 #endif
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/kl/kl_lowgetc.c b/arch/arm/src/kl/kl_lowgetc.c
index cd830093b9..f1c02981d2 100644
--- a/arch/arm/src/kl/kl_lowgetc.c
+++ b/arch/arm/src/kl/kl_lowgetc.c
@@ -90,7 +90,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/kl/kl_lowputc.c b/arch/arm/src/kl/kl_lowputc.c
index cb08623a5c..669d18b34a 100644
--- a/arch/arm/src/kl/kl_lowputc.c
+++ b/arch/arm/src/kl/kl_lowputc.c
@@ -97,7 +97,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/kl/kl_serial.c b/arch/arm/src/kl/kl_serial.c
index 5b4e8f35d6..fb135ca795 100644
--- a/arch/arm/src/kl/kl_serial.c
+++ b/arch/arm/src/kl/kl_serial.c
@@ -182,7 +182,7 @@ static void up_txint(struct uart_dev_s *dev, bool enable);
 static bool up_txready(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/lpc11xx/lpc11_lowgetc.c b/arch/arm/src/lpc11xx/lpc11_lowgetc.c
index 2591d90067..a0a12b6108 100644
--- a/arch/arm/src/lpc11xx/lpc11_lowgetc.c
+++ b/arch/arm/src/lpc11xx/lpc11_lowgetc.c
@@ -92,7 +92,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc11xx/lpc11_lowputc.c b/arch/arm/src/lpc11xx/lpc11_lowputc.c
index c7a0168177..dcba013127 100644
--- a/arch/arm/src/lpc11xx/lpc11_lowputc.c
+++ b/arch/arm/src/lpc11xx/lpc11_lowputc.c
@@ -136,7 +136,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc11xx/lpc11_serial.c b/arch/arm/src/lpc11xx/lpc11_serial.c
index c8fc508e72..6bbd488a3e 100644
--- a/arch/arm/src/lpc11xx/lpc11_serial.c
+++ b/arch/arm/src/lpc11xx/lpc11_serial.c
@@ -116,7 +116,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/lpc17xx/lpc17_lowputc.c b/arch/arm/src/lpc17xx/lpc17_lowputc.c
index bef1be6887..3670014588 100644
--- a/arch/arm/src/lpc17xx/lpc17_lowputc.c
+++ b/arch/arm/src/lpc17xx/lpc17_lowputc.c
@@ -242,7 +242,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc17xx/lpc17_serial.c b/arch/arm/src/lpc17xx/lpc17_serial.c
index a430340175..d0e2ceeecf 100644
--- a/arch/arm/src/lpc17xx/lpc17_serial.c
+++ b/arch/arm/src/lpc17xx/lpc17_serial.c
@@ -115,7 +115,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/lpc214x/lpc214x_lowputc.S b/arch/arm/src/lpc214x/lpc214x_lowputc.S
index 320be8ef56..179f440b4b 100644
--- a/arch/arm/src/lpc214x/lpc214x_lowputc.S
+++ b/arch/arm/src/lpc214x/lpc214x_lowputc.S
@@ -119,7 +119,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Private Variables
+ * Private Data
  **************************************************************************/
 
 /**************************************************************************
diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c
index a3cc08157c..041f9b8c05 100644
--- a/arch/arm/src/lpc214x/lpc214x_serial.c
+++ b/arch/arm/src/lpc214x/lpc214x_serial.c
@@ -99,7 +99,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/lpc2378/lpc23xx_lowputc.S b/arch/arm/src/lpc2378/lpc23xx_lowputc.S
index 9f5aec15af..d9d4c455d1 100755
--- a/arch/arm/src/lpc2378/lpc23xx_lowputc.S
+++ b/arch/arm/src/lpc2378/lpc23xx_lowputc.S
@@ -155,7 +155,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Private Variables
+ * Private Data
  **************************************************************************/
 
 /**************************************************************************
diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c
index b591e5091a..389d713284 100644
--- a/arch/arm/src/lpc2378/lpc23xx_serial.c
+++ b/arch/arm/src/lpc2378/lpc23xx_serial.c
@@ -107,7 +107,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/lpc31xx/lpc31_boot.c b/arch/arm/src/lpc31xx/lpc31_boot.c
index 7a28e2f9ea..1932b8fee7 100644
--- a/arch/arm/src/lpc31xx/lpc31_boot.c
+++ b/arch/arm/src/lpc31xx/lpc31_boot.c
@@ -80,7 +80,7 @@ extern uint32_t _vector_start; /* Beginning of vector block */
 extern uint32_t _vector_end;   /* End+1 of vector block */
 
 /************************************************************************************
- * Private Variables
+ * Private Data
  ************************************************************************************/
 
 /* This table describes how to map a set of 1Mb pages to space the physical address
diff --git a/arch/arm/src/lpc31xx/lpc31_lowputc.c b/arch/arm/src/lpc31xx/lpc31_lowputc.c
index 6ab86a5b8b..189ad0b9c7 100644
--- a/arch/arm/src/lpc31xx/lpc31_lowputc.c
+++ b/arch/arm/src/lpc31xx/lpc31_lowputc.c
@@ -92,7 +92,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c
index 0b449998f3..6567ce267e 100644
--- a/arch/arm/src/lpc31xx/lpc31_serial.c
+++ b/arch/arm/src/lpc31xx/lpc31_serial.c
@@ -99,7 +99,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c
index 9d51f9a405..0dda586af1 100644
--- a/arch/arm/src/lpc43xx/lpc43_serial.c
+++ b/arch/arm/src/lpc43xx/lpc43_serial.c
@@ -115,7 +115,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/lpc43xx/lpc43_uart.c b/arch/arm/src/lpc43xx/lpc43_uart.c
index 1806333979..88d7950e6a 100644
--- a/arch/arm/src/lpc43xx/lpc43_uart.c
+++ b/arch/arm/src/lpc43xx/lpc43_uart.c
@@ -152,7 +152,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/moxart/moxart_lowputc.S b/arch/arm/src/moxart/moxart_lowputc.S
index 750f915e86..ea1f552f2a 100644
--- a/arch/arm/src/moxart/moxart_lowputc.S
+++ b/arch/arm/src/moxart/moxart_lowputc.S
@@ -60,7 +60,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Private Variables
+ * Private Data
  **************************************************************************/
 
 /**************************************************************************
diff --git a/arch/arm/src/nuc1xx/nuc_serial.c b/arch/arm/src/nuc1xx/nuc_serial.c
index dcf203115b..a098db77ce 100644
--- a/arch/arm/src/nuc1xx/nuc_serial.c
+++ b/arch/arm/src/nuc1xx/nuc_serial.c
@@ -112,7 +112,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/sam34/sam4l_clockconfig.c b/arch/arm/src/sam34/sam4l_clockconfig.c
index 657f0b919d..3b6ec2a701 100644
--- a/arch/arm/src/sam34/sam4l_clockconfig.c
+++ b/arch/arm/src/sam34/sam4l_clockconfig.c
@@ -450,7 +450,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/sam34/sam4l_periphclks.c b/arch/arm/src/sam34/sam4l_periphclks.c
index 3456218404..29e9d3cbf3 100644
--- a/arch/arm/src/sam34/sam4l_periphclks.c
+++ b/arch/arm/src/sam34/sam4l_periphclks.c
@@ -83,7 +83,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/sam34/sam_lowputc.c b/arch/arm/src/sam34/sam_lowputc.c
index 8fb1123b83..88be9f0752 100644
--- a/arch/arm/src/sam34/sam_lowputc.c
+++ b/arch/arm/src/sam34/sam_lowputc.c
@@ -259,7 +259,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/sam34/sam_serial.c b/arch/arm/src/sam34/sam_serial.c
index cb96ea0a34..306a1210ea 100644
--- a/arch/arm/src/sam34/sam_serial.c
+++ b/arch/arm/src/sam34/sam_serial.c
@@ -381,7 +381,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/sama5/sam_dbgu.c b/arch/arm/src/sama5/sam_dbgu.c
index e04f57c6d7..877e1db82d 100644
--- a/arch/arm/src/sama5/sam_dbgu.c
+++ b/arch/arm/src/sama5/sam_dbgu.c
@@ -102,7 +102,7 @@ static bool dbgu_txready(struct uart_dev_s *dev);
 static bool dbgu_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/sama5/sam_flexcom_serial.c b/arch/arm/src/sama5/sam_flexcom_serial.c
index 022cd1e67b..c65c1aab47 100644
--- a/arch/arm/src/sama5/sam_flexcom_serial.c
+++ b/arch/arm/src/sama5/sam_flexcom_serial.c
@@ -264,7 +264,7 @@ static bool flexus_txready(struct uart_dev_s *dev);
 static bool flexus_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_flexus_ops =
diff --git a/arch/arm/src/sama5/sam_serial.c b/arch/arm/src/sama5/sam_serial.c
index 13e72eb986..0083606dba 100644
--- a/arch/arm/src/sama5/sam_serial.c
+++ b/arch/arm/src/sama5/sam_serial.c
@@ -481,7 +481,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/samdl/sam_serial.c b/arch/arm/src/samdl/sam_serial.c
index aba5980aad..ac94f694ac 100644
--- a/arch/arm/src/samdl/sam_serial.c
+++ b/arch/arm/src/samdl/sam_serial.c
@@ -285,7 +285,7 @@ static void sam_txint(struct uart_dev_s *dev, bool enable);
 static bool sam_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/samv7/sam_lowputc.c b/arch/arm/src/samv7/sam_lowputc.c
index e1b3ae4d6a..502884cc0d 100644
--- a/arch/arm/src/samv7/sam_lowputc.c
+++ b/arch/arm/src/samv7/sam_lowputc.c
@@ -185,7 +185,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/samv7/sam_serial.c b/arch/arm/src/samv7/sam_serial.c
index 8d16e2947c..bb7827ea63 100644
--- a/arch/arm/src/samv7/sam_serial.c
+++ b/arch/arm/src/samv7/sam_serial.c
@@ -388,7 +388,7 @@ static bool sam_txready(struct uart_dev_s *dev);
 static bool sam_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/stm32/stm32_lowputc.c b/arch/arm/src/stm32/stm32_lowputc.c
index 70390d4855..4307c45748 100644
--- a/arch/arm/src/stm32/stm32_lowputc.c
+++ b/arch/arm/src/stm32/stm32_lowputc.c
@@ -381,7 +381,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c
index 4510e6b158..25927cad73 100644
--- a/arch/arm/src/stm32/stm32_serial.c
+++ b/arch/arm/src/stm32/stm32_serial.c
@@ -393,7 +393,7 @@ static int up_interrupt_uart8(int irq, void *context);
 #endif
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 #ifndef SERIAL_HAVE_ONLY_DMA
diff --git a/arch/arm/src/stm32f7/stm32_lowputc.c b/arch/arm/src/stm32f7/stm32_lowputc.c
index 603f2be713..d642c862a6 100644
--- a/arch/arm/src/stm32f7/stm32_lowputc.c
+++ b/arch/arm/src/stm32f7/stm32_lowputc.c
@@ -313,7 +313,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32f7/stm32_procfs_dtcm.c b/arch/arm/src/stm32f7/stm32_procfs_dtcm.c
index 14bffc4e34..af6f467fef 100644
--- a/arch/arm/src/stm32f7/stm32_procfs_dtcm.c
+++ b/arch/arm/src/stm32f7/stm32_procfs_dtcm.c
@@ -108,7 +108,7 @@ static int     dtcm_dup(FAR const struct file *oldp,
 static int     dtcm_stat(FAR const char *relpath, FAR struct stat *buf);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32f7/stm32_serial.c b/arch/arm/src/stm32f7/stm32_serial.c
index c500991978..bdc3717ed4 100644
--- a/arch/arm/src/stm32f7/stm32_serial.c
+++ b/arch/arm/src/stm32f7/stm32_serial.c
@@ -347,7 +347,7 @@ static int up_interrupt_uart8(int irq, void *context);
 #endif
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 #ifndef SERIAL_HAVE_ONLY_DMA
diff --git a/arch/arm/src/str71x/str71x_lowputc.c b/arch/arm/src/str71x/str71x_lowputc.c
index 787aafe2cf..aa569d7fd9 100644
--- a/arch/arm/src/str71x/str71x_lowputc.c
+++ b/arch/arm/src/str71x/str71x_lowputc.c
@@ -236,7 +236,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c
index 2d80e0440b..fe98f543aa 100644
--- a/arch/arm/src/str71x/str71x_serial.c
+++ b/arch/arm/src/str71x/str71x_serial.c
@@ -265,7 +265,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/tiva/tiva_lowputc.c b/arch/arm/src/tiva/tiva_lowputc.c
index f97036bbde..e355fce67a 100644
--- a/arch/arm/src/tiva/tiva_lowputc.c
+++ b/arch/arm/src/tiva/tiva_lowputc.c
@@ -213,7 +213,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/tiva/tiva_serial.c b/arch/arm/src/tiva/tiva_serial.c
index 70113b95ec..fb9ea3ee61 100644
--- a/arch/arm/src/tiva/tiva_serial.c
+++ b/arch/arm/src/tiva/tiva_serial.c
@@ -330,7 +330,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/arm/src/tms570/tms570_serial.c b/arch/arm/src/tms570/tms570_serial.c
index 3f638edc35..b52755ac3e 100644
--- a/arch/arm/src/tms570/tms570_serial.c
+++ b/arch/arm/src/tms570/tms570_serial.c
@@ -161,7 +161,7 @@ static bool tms570_txready(struct uart_dev_s *dev);
 static bool tms570_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_sci_ops =
diff --git a/arch/avr/src/at32uc3/at32uc3_clkinit.c b/arch/avr/src/at32uc3/at32uc3_clkinit.c
index ede74c7492..7ee14cdc6c 100644
--- a/arch/avr/src/at32uc3/at32uc3_clkinit.c
+++ b/arch/avr/src/at32uc3/at32uc3_clkinit.c
@@ -78,7 +78,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/avr/src/at32uc3/at32uc3_gpio.c b/arch/avr/src/at32uc3/at32uc3_gpio.c
index a1a7e07aff..256f75e6d6 100644
--- a/arch/avr/src/at32uc3/at32uc3_gpio.c
+++ b/arch/avr/src/at32uc3/at32uc3_gpio.c
@@ -73,7 +73,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static uint32_t g_portmap[AVR32_NGPIO_PORTS] =
diff --git a/arch/avr/src/at32uc3/at32uc3_lowconsole.c b/arch/avr/src/at32uc3/at32uc3_lowconsole.c
index acf6694b11..8731ada4c0 100644
--- a/arch/avr/src/at32uc3/at32uc3_lowconsole.c
+++ b/arch/avr/src/at32uc3/at32uc3_lowconsole.c
@@ -94,7 +94,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/avr/src/at32uc3/at32uc3_lowinit.c b/arch/avr/src/at32uc3/at32uc3_lowinit.c
index 155deb7752..3f11a8755e 100644
--- a/arch/avr/src/at32uc3/at32uc3_lowinit.c
+++ b/arch/avr/src/at32uc3/at32uc3_lowinit.c
@@ -60,7 +60,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/avr/src/at32uc3/at32uc3_serial.c b/arch/avr/src/at32uc3/at32uc3_serial.c
index c597e1247f..f01dcc6ac7 100644
--- a/arch/avr/src/at32uc3/at32uc3_serial.c
+++ b/arch/avr/src/at32uc3/at32uc3_serial.c
@@ -170,7 +170,7 @@ static void up_txint(struct uart_dev_s *dev, bool enable);
 static bool up_txready(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/avr/src/at90usb/at90usb_lowconsole.c b/arch/avr/src/at90usb/at90usb_lowconsole.c
index 0fc4e18d9c..7ddc2d8e9f 100644
--- a/arch/avr/src/at90usb/at90usb_lowconsole.c
+++ b/arch/avr/src/at90usb/at90usb_lowconsole.c
@@ -129,7 +129,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/avr/src/at90usb/at90usb_lowinit.c b/arch/avr/src/at90usb/at90usb_lowinit.c
index e8559225e7..9a416f5680 100644
--- a/arch/avr/src/at90usb/at90usb_lowinit.c
+++ b/arch/avr/src/at90usb/at90usb_lowinit.c
@@ -84,7 +84,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/avr/src/at90usb/at90usb_serial.c b/arch/avr/src/at90usb/at90usb_serial.c
index 5eaa6a5efa..25077f5743 100644
--- a/arch/avr/src/at90usb/at90usb_serial.c
+++ b/arch/avr/src/at90usb/at90usb_serial.c
@@ -102,7 +102,7 @@ static bool usart1_txready(struct uart_dev_s *dev);
 static bool usart1_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 struct uart_ops_s g_uart1_ops =
diff --git a/arch/avr/src/atmega/atmega_lowconsole.c b/arch/avr/src/atmega/atmega_lowconsole.c
index 28fb17d840..2592e28027 100644
--- a/arch/avr/src/atmega/atmega_lowconsole.c
+++ b/arch/avr/src/atmega/atmega_lowconsole.c
@@ -192,7 +192,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/avr/src/atmega/atmega_lowinit.c b/arch/avr/src/atmega/atmega_lowinit.c
index 1a1efb0afc..50cf88f888 100644
--- a/arch/avr/src/atmega/atmega_lowinit.c
+++ b/arch/avr/src/atmega/atmega_lowinit.c
@@ -84,7 +84,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/avr/src/atmega/atmega_serial.c b/arch/avr/src/atmega/atmega_serial.c
index 2691467b97..9f770363a1 100644
--- a/arch/avr/src/atmega/atmega_serial.c
+++ b/arch/avr/src/atmega/atmega_serial.c
@@ -144,7 +144,7 @@ static bool usart1_txempty(struct uart_dev_s *dev);
 #endif
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /* USART0 operations */
diff --git a/arch/avr/src/common/up_mdelay.c b/arch/avr/src/common/up_mdelay.c
index 1b1a63a4ff..bf594a3b08 100644
--- a/arch/avr/src/common/up_mdelay.c
+++ b/arch/avr/src/common/up_mdelay.c
@@ -53,7 +53,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/avr/src/common/up_udelay.c b/arch/avr/src/common/up_udelay.c
index 6cab395672..f71d5ee6b2 100644
--- a/arch/avr/src/common/up_udelay.c
+++ b/arch/avr/src/common/up_udelay.c
@@ -58,7 +58,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/hc/src/common/up_mdelay.c b/arch/hc/src/common/up_mdelay.c
index 8240be055f..9472dc3d93 100644
--- a/arch/hc/src/common/up_mdelay.c
+++ b/arch/hc/src/common/up_mdelay.c
@@ -53,7 +53,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/hc/src/common/up_udelay.c b/arch/hc/src/common/up_udelay.c
index fba3064425..d4b2d3aad8 100644
--- a/arch/hc/src/common/up_udelay.c
+++ b/arch/hc/src/common/up_udelay.c
@@ -58,7 +58,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/hc/src/m9s12/m9s12_lowputc.S b/arch/hc/src/m9s12/m9s12_lowputc.S
index f5b495da74..1b363435e9 100755
--- a/arch/hc/src/m9s12/m9s12_lowputc.S
+++ b/arch/hc/src/m9s12/m9s12_lowputc.S
@@ -121,7 +121,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Private Variables
+ * Private Data
  **************************************************************************/
 
 /**************************************************************************
diff --git a/arch/hc/src/m9s12/m9s12_saveusercontext.S b/arch/hc/src/m9s12/m9s12_saveusercontext.S
index 8797cd4b04..8538cc1f06 100755
--- a/arch/hc/src/m9s12/m9s12_saveusercontext.S
+++ b/arch/hc/src/m9s12/m9s12_saveusercontext.S
@@ -69,7 +69,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Private Variables
+ * Private Data
  **************************************************************************/
 
 /**************************************************************************
diff --git a/arch/hc/src/m9s12/m9s12_serial.c b/arch/hc/src/m9s12/m9s12_serial.c
index 325a8e290b..1bc0091395 100644
--- a/arch/hc/src/m9s12/m9s12_serial.c
+++ b/arch/hc/src/m9s12/m9s12_serial.c
@@ -134,7 +134,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 struct uart_ops_s g_sci_ops =
diff --git a/arch/mips/src/common/up_mdelay.c b/arch/mips/src/common/up_mdelay.c
index 9df5d24e0a..d2cb5d05b3 100644
--- a/arch/mips/src/common/up_mdelay.c
+++ b/arch/mips/src/common/up_mdelay.c
@@ -53,7 +53,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/mips/src/common/up_udelay.c b/arch/mips/src/common/up_udelay.c
index 29f88541af..496811cd79 100644
--- a/arch/mips/src/common/up_udelay.c
+++ b/arch/mips/src/common/up_udelay.c
@@ -58,7 +58,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/mips/src/pic32mx/pic32mx-lowconsole.c b/arch/mips/src/pic32mx/pic32mx-lowconsole.c
index d45bbaf97d..5c3f2b4116 100644
--- a/arch/mips/src/pic32mx/pic32mx-lowconsole.c
+++ b/arch/mips/src/pic32mx/pic32mx-lowconsole.c
@@ -112,7 +112,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/mips/src/pic32mx/pic32mx-lowinit.c b/arch/mips/src/pic32mx/pic32mx-lowinit.c
index ee04000b60..544baa36cf 100644
--- a/arch/mips/src/pic32mx/pic32mx-lowinit.c
+++ b/arch/mips/src/pic32mx/pic32mx-lowinit.c
@@ -90,7 +90,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/mips/src/pic32mx/pic32mx-serial.c b/arch/mips/src/pic32mx/pic32mx-serial.c
index 52ec9c91de..590c5998a1 100644
--- a/arch/mips/src/pic32mx/pic32mx-serial.c
+++ b/arch/mips/src/pic32mx/pic32mx-serial.c
@@ -184,7 +184,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/mips/src/pic32mz/pic32mz-lowconsole.c b/arch/mips/src/pic32mz/pic32mz-lowconsole.c
index 1d677179bc..d16e81631a 100644
--- a/arch/mips/src/pic32mz/pic32mz-lowconsole.c
+++ b/arch/mips/src/pic32mz/pic32mz-lowconsole.c
@@ -114,7 +114,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/mips/src/pic32mz/pic32mz-lowinit.c b/arch/mips/src/pic32mz/pic32mz-lowinit.c
index 595d085b80..50306ca40c 100644
--- a/arch/mips/src/pic32mz/pic32mz-lowinit.c
+++ b/arch/mips/src/pic32mz/pic32mz-lowinit.c
@@ -177,7 +177,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/mips/src/pic32mz/pic32mz-serial.c b/arch/mips/src/pic32mz/pic32mz-serial.c
index 735b12eee8..6845ff5035 100644
--- a/arch/mips/src/pic32mz/pic32mz-serial.c
+++ b/arch/mips/src/pic32mz/pic32mz-serial.c
@@ -307,7 +307,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/rgmp/src/x86/com.c b/arch/rgmp/src/x86/com.c
index 279cb35154..8a149bcadc 100644
--- a/arch/rgmp/src/x86/com.c
+++ b/arch/rgmp/src/x86/com.c
@@ -140,7 +140,7 @@ static bool up_txready(struct uart_dev_s *dev);
 static bool up_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static struct uart_ops_s g_com_ops =
diff --git a/arch/sh/src/common/up_mdelay.c b/arch/sh/src/common/up_mdelay.c
index deea95e215..e7ed4f9015 100644
--- a/arch/sh/src/common/up_mdelay.c
+++ b/arch/sh/src/common/up_mdelay.c
@@ -53,7 +53,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/sh/src/common/up_udelay.c b/arch/sh/src/common/up_udelay.c
index 16aad765d5..6af5d2f76d 100644
--- a/arch/sh/src/common/up_udelay.c
+++ b/arch/sh/src/common/up_udelay.c
@@ -58,7 +58,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/sh/src/m16c/m16c_lowputc.c b/arch/sh/src/m16c/m16c_lowputc.c
index f38d75b06f..5ec641fbec 100644
--- a/arch/sh/src/m16c/m16c_lowputc.c
+++ b/arch/sh/src/m16c/m16c_lowputc.c
@@ -184,7 +184,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/sh/src/m16c/m16c_serial.c b/arch/sh/src/m16c/m16c_serial.c
index 85d160445e..6aeb973f75 100644
--- a/arch/sh/src/m16c/m16c_serial.c
+++ b/arch/sh/src/m16c/m16c_serial.c
@@ -279,7 +279,7 @@ static void up_txint(struct uart_dev_s *dev, bool enable);
 static bool up_txready(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/sh/src/sh1/sh1_lowputc.c b/arch/sh/src/sh1/sh1_lowputc.c
index 7a6a704c69..8b423b75b8 100644
--- a/arch/sh/src/sh1/sh1_lowputc.c
+++ b/arch/sh/src/sh1/sh1_lowputc.c
@@ -158,7 +158,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/sh/src/sh1/sh1_saveusercontext.S b/arch/sh/src/sh1/sh1_saveusercontext.S
index 5be7d94d4e..8084e5bd0d 100644
--- a/arch/sh/src/sh1/sh1_saveusercontext.S
+++ b/arch/sh/src/sh1/sh1_saveusercontext.S
@@ -57,7 +57,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Private Variables
+ * Private Data
  **************************************************************************/
 
 /**************************************************************************
diff --git a/arch/sh/src/sh1/sh1_serial.c b/arch/sh/src/sh1/sh1_serial.c
index e1f34fa29e..44c9cf8a93 100644
--- a/arch/sh/src/sh1/sh1_serial.c
+++ b/arch/sh/src/sh1/sh1_serial.c
@@ -167,7 +167,7 @@ static void up_txint(struct uart_dev_s *dev, bool enable);
 static bool up_txready(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 struct uart_ops_s g_sci_ops =
diff --git a/arch/x86/src/common/up_mdelay.c b/arch/x86/src/common/up_mdelay.c
index 13c711700f..a7f2d693ed 100644
--- a/arch/x86/src/common/up_mdelay.c
+++ b/arch/x86/src/common/up_mdelay.c
@@ -53,7 +53,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/x86/src/common/up_udelay.c b/arch/x86/src/common/up_udelay.c
index 9758125e32..4869741860 100644
--- a/arch/x86/src/common/up_udelay.c
+++ b/arch/x86/src/common/up_udelay.c
@@ -58,7 +58,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/z16/src/common/up_mdelay.c b/arch/z16/src/common/up_mdelay.c
index 0d2c2eb34f..810754dd90 100644
--- a/arch/z16/src/common/up_mdelay.c
+++ b/arch/z16/src/common/up_mdelay.c
@@ -55,7 +55,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/z16/src/common/up_udelay.c b/arch/z16/src/common/up_udelay.c
index d6a0c80b1d..54545ac072 100644
--- a/arch/z16/src/common/up_udelay.c
+++ b/arch/z16/src/common/up_udelay.c
@@ -60,7 +60,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/z16/src/z16f/z16f_serial.c b/arch/z16/src/z16f/z16f_serial.c
index 9a371dba22..dcbcff5cef 100644
--- a/arch/z16/src/z16f/z16f_serial.c
+++ b/arch/z16/src/z16f/z16f_serial.c
@@ -107,7 +107,7 @@ static bool z16f_txready(struct uart_dev_s *dev);
 static bool z16f_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
@@ -874,7 +874,7 @@ int up_putc(int ch)
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/z80/src/common/up_mdelay.c b/arch/z80/src/common/up_mdelay.c
index ff192eadb6..607ce48453 100644
--- a/arch/z80/src/common/up_mdelay.c
+++ b/arch/z80/src/common/up_mdelay.c
@@ -55,7 +55,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/z80/src/common/up_udelay.c b/arch/z80/src/common/up_udelay.c
index b9545cc216..be5224a20d 100644
--- a/arch/z80/src/common/up_udelay.c
+++ b/arch/z80/src/common/up_udelay.c
@@ -60,7 +60,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/z80/src/ez80/ez80_serial.c b/arch/z80/src/ez80/ez80_serial.c
index fa64679356..4fbfdda7d5 100644
--- a/arch/z80/src/ez80/ez80_serial.c
+++ b/arch/z80/src/ez80/ez80_serial.c
@@ -96,7 +96,7 @@ static bool ez80_txready(struct uart_dev_s *dev);
 static bool ez80_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
@@ -797,7 +797,7 @@ int up_putc(int ch)
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/z80/src/z180/z180_scc.c b/arch/z80/src/z180/z180_scc.c
index c07dd67fb8..5c967a150e 100644
--- a/arch/z80/src/z180/z180_scc.c
+++ b/arch/z80/src/z180/z180_scc.c
@@ -100,7 +100,7 @@ static bool z180_txready(struct uart_dev_s *dev);
 static bool z180_txempty(struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
diff --git a/arch/z80/src/z8/z8_serial.c b/arch/z80/src/z8/z8_serial.c
index 97e0839fa4..f7fe721ac0 100644
--- a/arch/z80/src/z8/z8_serial.c
+++ b/arch/z80/src/z8/z8_serial.c
@@ -108,7 +108,7 @@ static bool z8_txready(FAR struct uart_dev_s *dev);
 static bool z8_txempty(FAR struct uart_dev_s *dev);
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 static const struct uart_ops_s g_uart_ops =
@@ -811,7 +811,7 @@ int up_putc(int ch)
  ****************************************************************************/
 
 /****************************************************************************
- * Private Variables
+ * Private Data
  ****************************************************************************/
 
 /****************************************************************************