diff --git a/arch/arm/src/lpc2378/Kconfig b/arch/arm/src/lpc2378/Kconfig
index b0637400c9..e9dd177782 100644
--- a/arch/arm/src/lpc2378/Kconfig
+++ b/arch/arm/src/lpc2378/Kconfig
@@ -56,7 +56,7 @@ config LPC2378_MAM_SETUP
 	bool "Configure the Memory Accelerator Module (MAM)"
 	default y
 
-config LPC2378_LPC2378_MAMCR_VALUE
+config LPC2378_MAMCR_VALUE
 	int "Memory accelerator mode"
 	default 1
 	range 0 2
@@ -67,7 +67,7 @@ config LPC2378_LPC2378_MAMCR_VALUE
 		PART	1
 		FULL	2
 
-config LPC2378_LPC2378_MAMTIM_VALUE
+config LPC2378_MAMTIM_VALUE
 	int "Memory accelerator timing value"
 	default 3
 	---help---
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c
index d8a48709e7..237dc1ac25 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.c
@@ -73,7 +73,7 @@
  * mtd device on the SPIFI FLASH.  NOTE:  CONFIG_LPC43_SPIFI=y must also
  * be defined to enable SPIFI setup support:
  *
- * CONFIG_SPIFI_RDONLY - Create a read only device on SPIFI.
+ * CONFIG_SPIFI_READONLY - Create a read only device on SPIFI.
  * CONFIG_SPIFI_OFFSET - Offset the beginning of the block driver this many
  *   bytes into the device address space.  This offset must be an exact
  *   multiple of the erase block size. Default 0.
diff --git a/arch/arm/src/nuc1xx/nuc_config.h b/arch/arm/src/nuc1xx/nuc_config.h
index e985c2344a..11f3e3f04e 100644
--- a/arch/arm/src/nuc1xx/nuc_config.h
+++ b/arch/arm/src/nuc1xx/nuc_config.h
@@ -73,19 +73,19 @@
 
 #ifndef CONFIG_NUC_UART0
 #  undef CONFIG_UART0_SERIAL_CONSOLE
-#  undef CONFIG_UART0_FLOW_CONTROL
+#  undef CONFIG_UART0_FLOWCONTROL
 #  undef CONFIG_UART0_IRDAMODE
 #  undef CONFIG_UART0_RS485MODE
 #endif
 
 #ifndef CONFIG_NUC_UART1
 #  undef CONFIG_UART1_SERIAL_CONSOLE
-#  undef CONFIG_UART1_FLOW_CONTROL
+#  undef CONFIG_UART1_FLOWCONTROL
 #  undef CONFIG_UART1_IRDAMODE
 #  undef CONFIG_UART1_RS485MODE
 #endif
 
-#undef CONFIG_UART2_FLOW_CONTROL  /* UART2 does not support flow control */
+#undef CONFIG_UART2_FLOWCONTROL  /* UART2 does not support flow control */
 #ifndef CONFIG_NUC_UART2
 #  undef CONFIG_UART2_SERIAL_CONSOLE
 #  undef CONFIG_UART2_IRDAMODE
diff --git a/arch/arm/src/nuc1xx/nuc_lowputc.c b/arch/arm/src/nuc1xx/nuc_lowputc.c
index c66a20d87a..dc22db8774 100644
--- a/arch/arm/src/nuc1xx/nuc_lowputc.c
+++ b/arch/arm/src/nuc1xx/nuc_lowputc.c
@@ -160,7 +160,7 @@ void nuc_lowsetup(void)
   regval = getreg32(NUC_GCR_GPB_MFP);
 
 #ifdef CONFIG_NUC_UART0
-#ifdef CONFIG_UART0_FLOW_CONTROL
+#ifdef CONFIG_UART0_FLOWCONTROL
   regval |= (GCR_GPB_MFP0 | GCR_GPB_MFP1 | GCR_GPB_MFP2| GCR_GPB_MFP3);
 #else
   regval |= (GCR_GPB_MFP0 | GCR_GPB_MFP1);
@@ -173,7 +173,7 @@ void nuc_lowsetup(void)
    */
 
 #ifdef CONFIG_NUC_UART1
-#ifdef CONFIG_UART1_FLOW_CONTROL
+#ifdef CONFIG_UART1_FLOWCONTROL
   regval |= (GCR_GPB_MFP4 | GCR_GPB_MFP5 | GCR_GPB_MFP6| GCR_GPB_MFP7)
 #else
   regval |= (GCR_GPB_MFP4 | GCR_GPB_MFP5);
@@ -182,14 +182,14 @@ void nuc_lowsetup(void)
 
   putreg32(regval, NUC_GCR_GPB_MFP);
 
-#if defined(CONFIG_UART0_FLOW_CONTROL) || defined(CONFIG_UART1_FLOW_CONTROL)
+#if defined(CONFIG_UART0_FLOWCONTROL) || defined(CONFIG_UART1_FLOWCONTROL)
   regval = getreg32(NUC_GCR_ALT_MFP);
   regval &= ~GCR_ALT_MFP_EBI_EN;
-#ifdef CONFIG_UART0_FLOW_CONTROL
+#ifdef CONFIG_UART0_FLOWCONTROL
   regval &= ~(GCR_ALT_MFP_EBI_NWRL_EN | GCR_ALT_MFP_EBI_NWRH_WN);
 #endif
   putreg32(NUC_GCR_ALT_MFP);
-#endif /* CONFIG_UART0_FLOW_CONTROL || CONFIG_UART1_FLOW_CONTROL */
+#endif /* CONFIG_UART0_FLOWCONTROL || CONFIG_UART1_FLOWCONTROL */
 #endif /* CONFIG_NUC_UART0 || CONFIG_NUC_UART1 */
 
   /* UART1 TX/RX support requires that GPIOD bits 14 and 15 be set.  UART2
diff --git a/arch/arm/src/samdl/sam_config.h b/arch/arm/src/samdl/sam_config.h
index a7fbbe9d6e..846e3291d3 100644
--- a/arch/arm/src/samdl/sam_config.h
+++ b/arch/arm/src/samdl/sam_config.h
@@ -60,7 +60,7 @@
 #  undef SAMDL_HAVE_USART0
 #  undef CONFIG_SAMDL_SERCOM0_ISUSART
 #  undef CONFIG_USART0_SERIAL_CONSOLE
-#  undef CONFIG_USART0_FLOW_CONTROL
+#  undef CONFIG_USART0_FLOWCONTROL
 #  undef CONFIG_USART0_IRDAMODE
 #  undef CONFIG_USART0_RS485MODE
 #endif
@@ -70,7 +70,7 @@
 #  undef SAMDL_HAVE_USART1
 #  undef CONFIG_SAMDL_SERCOM1_ISUSART
 #  undef CONFIG_USART1_SERIAL_CONSOLE
-#  undef CONFIG_USART1_FLOW_CONTROL
+#  undef CONFIG_USART1_FLOWCONTROL
 #  undef CONFIG_USART1_IRDAMODE
 #  undef CONFIG_USART1_RS485MODE
 #endif
@@ -80,7 +80,7 @@
 #  undef SAMDL_HAVE_USART2
 #  undef CONFIG_SAMDL_SERCOM2_ISUSART
 #  undef CONFIG_USART2_SERIAL_CONSOLE
-#  undef CONFIG_USART2_FLOW_CONTROL
+#  undef CONFIG_USART2_FLOWCONTROL
 #  undef CONFIG_USART2_IRDAMODE
 #  undef CONFIG_USART2_RS485MODE
 #endif
@@ -90,7 +90,7 @@
 #  undef SAMDL_HAVE_USART3
 #  undef CONFIG_SAMDL_SERCOM3_ISUSART
 #  undef CONFIG_USART3_SERIAL_CONSOLE
-#  undef CONFIG_USART3_FLOW_CONTROL
+#  undef CONFIG_USART3_FLOWCONTROL
 #  undef CONFIG_USART3_IRDAMODE
 #  undef CONFIG_USART3_RS485MODE
 #endif
@@ -100,7 +100,7 @@
 #  undef SAMDL_HAVE_USART4
 #  undef CONFIG_SAMDL_SERCOM4_ISUSART
 #  undef CONFIG_USART4_SERIAL_CONSOLE
-#  undef CONFIG_USART4_FLOW_CONTROL
+#  undef CONFIG_USART4_FLOWCONTROL
 #  undef CONFIG_USART4_IRDAMODE
 #  undef CONFIG_USART4_RS485MODE
 #endif
@@ -110,7 +110,7 @@
 #  undef SAMDL_HAVE_USART5
 #  undef CONFIG_SAMDL_SERCOM5_ISUSART
 #  undef CONFIG_USART5_SERIAL_CONSOLE
-#  undef CONFIG_USART5_FLOW_CONTROL
+#  undef CONFIG_USART5_FLOWCONTROL
 #  undef CONFIG_USART5_IRDAMODE
 #  undef CONFIG_USART5_RS485MODE
 #endif