diff --git a/configs/dk-tm4c129x/README.txt b/configs/dk-tm4c129x/README.txt
index 381f914bab2..93e9c77b863 100644
--- a/configs/dk-tm4c129x/README.txt
+++ b/configs/dk-tm4c129x/README.txt
@@ -2,11 +2,11 @@ README.txt
 ==========
 
   This README file discuss discusses the port of NuttX to the Texas
-  Instruments DK-TM4C129x Connected Development Kit.
+  Instruments DK-TM4C129X Connected Development Kit.
 
   Description
   -----------
-  The Tiva™ C Series TM4C129x Connected Development Kit highlights
+  The Tiva™ C Series TM4C129X Connected Development Kit highlights
   the 120-MHz Tiva C Series TM4C129XNCZAD ARM® Cortex™-M4 based
   microcontroller, including an integrated 10/100 Ethernet MAC +
   PHY as well as many other key features.
@@ -461,13 +461,13 @@ DK-TM4129X Configuration Options
 
   There are configurations for disabling support for interrupts GPIO ports.
   Only GPIOP and GPIOQ pins can be used as interrupting sources on the
-  TM4C129x.  Additional interrupt support can be disabled if desired to
+  TM4C129X.  Additional interrupt support can be disabled if desired to
   reduce memory footprint.
 
     CONFIG_TIVA_GPIOP_IRQS=y
     CONFIG_TIVA_GPIOQ_IRQS=y
 
-  TM4C129x specific device driver settings
+  TM4C129X specific device driver settings
 
     CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
        console and ttys0 (default is the UART0).
diff --git a/configs/dk-tm4c129x/src/dk-tm4c129x.h b/configs/dk-tm4c129x/src/dk-tm4c129x.h
index 543a1dbeac8..7a8b7f6d8ab 100644
--- a/configs/dk-tm4c129x/src/dk-tm4c129x.h
+++ b/configs/dk-tm4c129x/src/dk-tm4c129x.h
@@ -47,7 +47,7 @@
 #include "tiva_gpio.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /* Configuration ********************************************************************/
 
@@ -110,7 +110,7 @@
  * Name: tm4c_ssiinitialize
  *
  * Description:
- *   Called to configure SPI chip select GPIO pins for the DK-TM4C129x.
+ *   Called to configure SPI chip select GPIO pins for the DK-TM4C129X.
  *
  ************************************************************************************/
 
diff --git a/configs/dk-tm4c129x/src/tm4c_boot.c b/configs/dk-tm4c129x/src/tm4c_boot.c
index b35cc325b82..0da8dcc8d92 100644
--- a/configs/dk-tm4c129x/src/tm4c_boot.c
+++ b/configs/dk-tm4c129x/src/tm4c_boot.c
@@ -48,7 +48,7 @@
 #include "dk-tm4c129x.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
@@ -75,7 +75,7 @@ void tiva_boardinitialize(void)
    * tm4c_ssiinitialize() has been brought into the link.
    */
 
-  /* The DK-TM4C129x microSD CS and OLED are on SSI0 */
+  /* The DK-TM4C129X microSD CS and OLED are on SSI0 */
 
 #if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
   if (tm4c_ssiinitialize)
diff --git a/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c
index 2d021d902be..60d36af24e7 100644
--- a/configs/dk-tm4c129x/src/tm4c_ssi.c
+++ b/configs/dk-tm4c129x/src/tm4c_ssi.c
@@ -51,12 +51,12 @@
 #include "tiva_gpio.h"
 #include "dk-tm4c129x.h"
 
-/* The DK-TM4C129x microSD CS is on SSI0 */
+/* The DK-TM4C129X microSD CS is on SSI0 */
 
 #if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */
@@ -89,7 +89,7 @@
  * Name: tm4c_ssiinitialize
  *
  * Description:
- *   Called to configure SPI chip select GPIO pins for the DK-TM4C129x.
+ *   Called to configure SPI chip select GPIO pins for the DK-TM4C129X.
  *
  ************************************************************************************/
 
diff --git a/configs/sama5d4-ek/include/board_sdram.h b/configs/sama5d4-ek/include/board_sdram.h
index 8870475ec22..288e6a87d5f 100644
--- a/configs/sama5d4-ek/include/board_sdram.h
+++ b/configs/sama5d4-ek/include/board_sdram.h
@@ -44,7 +44,7 @@
 #include "sam_pmc.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* Clocking *************************************************************************/
diff --git a/configs/sama5d4-ek/src/sam_adc.c b/configs/sama5d4-ek/src/sam_adc.c
index 31f4d7c94ef..f45cc479957 100644
--- a/configs/sama5d4-ek/src/sam_adc.c
+++ b/configs/sama5d4-ek/src/sam_adc.c
@@ -50,9 +50,8 @@
 #ifdef CONFIG_ADC
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
-/* Configuration ********************************************************************/
 
 /************************************************************************************
  * Private Data
diff --git a/configs/sama5d4-ek/src/sam_buttons.c b/configs/sama5d4-ek/src/sam_buttons.c
index 2df0c8fbe6f..082a31965d2 100644
--- a/configs/sama5d4-ek/src/sam_buttons.c
+++ b/configs/sama5d4-ek/src/sam_buttons.c
@@ -64,7 +64,7 @@
 #ifdef CONFIG_ARCH_BUTTONS
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/configs/sama5d4-ek/src/sam_cxxinitialize.c b/configs/sama5d4-ek/src/sam_cxxinitialize.c
index 28f3cb2f6a1..1972c684851 100644
--- a/configs/sama5d4-ek/src/sam_cxxinitialize.c
+++ b/configs/sama5d4-ek/src/sam_cxxinitialize.c
@@ -49,7 +49,7 @@
 #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /* Debug ****************************************************************************/
 /* Non-standard debug that may be enabled just for testing the static constructors */
diff --git a/configs/sama5d4-ek/src/sam_ostest.c b/configs/sama5d4-ek/src/sam_ostest.c
index 7b1ad28fbb0..96bdb26dc72 100644
--- a/configs/sama5d4-ek/src/sam_ostest.c
+++ b/configs/sama5d4-ek/src/sam_ostest.c
@@ -52,7 +52,7 @@
 #include "sama5d4-ek.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /* Configuration ********************************************************************/
 
diff --git a/configs/sama5d4-ek/src/sam_pwm.c b/configs/sama5d4-ek/src/sam_pwm.c
index 7f01328b011..f6a5cb40740 100644
--- a/configs/sama5d4-ek/src/sam_pwm.c
+++ b/configs/sama5d4-ek/src/sam_pwm.c
@@ -50,7 +50,7 @@
 #include "sama5d4-ek.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /* Configuration ********************************************************************/
 /* PWM.  There are no dedicated PWM output pins available to the user for PWM
diff --git a/configs/sama5d4-ek/src/sam_spi.c b/configs/sama5d4-ek/src/sam_spi.c
index 56105cfbc21..b04a6f7e47a 100644
--- a/configs/sama5d4-ek/src/sam_spi.c
+++ b/configs/sama5d4-ek/src/sam_spi.c
@@ -56,7 +56,7 @@
 #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* Enables debug output from this file (needs CONFIG_DEBUG too) */
diff --git a/configs/sama5d4-ek/src/sam_userleds.c b/configs/sama5d4-ek/src/sam_userleds.c
index bc8ce1d5de1..6c95ae87a65 100644
--- a/configs/sama5d4-ek/src/sam_userleds.c
+++ b/configs/sama5d4-ek/src/sam_userleds.c
@@ -68,7 +68,7 @@
 #ifndef CONFIG_ARCH_LEDS
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
diff --git a/configs/tm4c123g-launchpad/include/board.h b/configs/tm4c123g-launchpad/include/board.h
index f2ebca3f40f..dc8029a9f01 100644
--- a/configs/tm4c123g-launchpad/include/board.h
+++ b/configs/tm4c123g-launchpad/include/board.h
@@ -41,7 +41,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* Clocking *************************************************************************/
diff --git a/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h b/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
index 90048154f29..05c5ea6b283 100644
--- a/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
+++ b/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
@@ -47,7 +47,7 @@
 #include "tiva_gpio.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /* Configuration ********************************************************************/
 
diff --git a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
index 7646898b163..fa8d3d82651 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
@@ -51,7 +51,7 @@
 #include "tm4c123g-launchpad.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* The TM4C123G LaunchPad has a single RGB LED.  There is only one visible LED
  * which will vary in color.  But, from the standpoint of the firmware, this
diff --git a/configs/tm4c123g-launchpad/src/tm4c_boot.c b/configs/tm4c123g-launchpad/src/tm4c_boot.c
index 7ad94d973d8..d76dddab7c6 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_boot.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_boot.c
@@ -48,7 +48,7 @@
 #include "tm4c123g-launchpad.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
index dd94d97bb09..eedae3e7712 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
@@ -56,7 +56,7 @@
 #if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */