diff --git a/arch/arm/src/kinetis/kinetis_internal.h b/arch/arm/src/kinetis/kinetis.h
similarity index 99%
rename from arch/arm/src/kinetis/kinetis_internal.h
rename to arch/arm/src/kinetis/kinetis.h
index 226ee351e3..1cd6cd47fb 100644
--- a/arch/arm/src/kinetis/kinetis_internal.h
+++ b/arch/arm/src/kinetis/kinetis.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_internal.h
+ * arch/arm/src/kinetis/kinetis.h
  *
  *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_INTERNAL_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_INTERNAL_H
+#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_H
+#define __ARCH_ARM_SRC_KINETIS_KINETIS_H
 
 /************************************************************************************
  * Included Files
@@ -846,4 +846,4 @@ void sdhc_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_INTERNAL_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_H */
diff --git a/arch/arm/src/kinetis/kinetis_clockconfig.c b/arch/arm/src/kinetis/kinetis_clockconfig.c
index b6489ca868..dc2fe0482b 100644
--- a/arch/arm/src/kinetis/kinetis_clockconfig.c
+++ b/arch/arm/src/kinetis/kinetis_clockconfig.c
@@ -44,7 +44,7 @@
 
 #include "up_arch.h"
 
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "kinetis_mcg.h"
 #include "kinetis_sim.h"
 #include "kinetis_fmc.h"
diff --git a/arch/arm/src/kinetis/kinetis_clrpend.c b/arch/arm/src/kinetis/kinetis_clrpend.c
index 3050b9324d..7f0395c4ae 100644
--- a/arch/arm/src/kinetis/kinetis_clrpend.c
+++ b/arch/arm/src/kinetis/kinetis_clrpend.c
@@ -44,7 +44,7 @@
 
 #include "nvic.h"
 #include "up_arch.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 47496a794e..b657ef7e7b 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -63,7 +63,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "kinetis_config.h"
 #include "kinetis_pinmux.h"
 #include "kinetis_sim.h"
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index 8a215f75bd..437d2b94b7 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -50,7 +50,7 @@
 #include "ram_vectors.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/kinetis/kinetis_lowputc.c b/arch/arm/src/kinetis/kinetis_lowputc.c
index 03f9b901f4..13aaa258e9 100644
--- a/arch/arm/src/kinetis/kinetis_lowputc.c
+++ b/arch/arm/src/kinetis/kinetis_lowputc.c
@@ -48,7 +48,7 @@
 #include "up_arch.h"
 
 #include "kinetis_config.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "kinetis_uart.h"
 #include "kinetis_sim.h"
 #include "kinetis_pinmux.h"
@@ -448,5 +448,3 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud,
 }
 #endif
 
-
-
diff --git a/arch/arm/src/kinetis/kinetis_pin.c b/arch/arm/src/kinetis/kinetis_pin.c
index dcf381dd99..851d0c9d9c 100644
--- a/arch/arm/src/kinetis/kinetis_pin.c
+++ b/arch/arm/src/kinetis/kinetis_pin.c
@@ -49,7 +49,7 @@
 #include "up_internal.h"
 
 #include "kinetis_memorymap.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "kinetis_port.h"
 #include "kinetis_gpio.h"
 
diff --git a/arch/arm/src/kinetis/kinetis_pingpio.c b/arch/arm/src/kinetis/kinetis_pingpio.c
index fe25f0df0f..3663a92399 100644
--- a/arch/arm/src/kinetis/kinetis_pingpio.c
+++ b/arch/arm/src/kinetis/kinetis_pingpio.c
@@ -49,7 +49,7 @@
 #include "up_internal.h"
 
 #include "kinetis_memorymap.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "kinetis_gpio.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis_pinirq.c b/arch/arm/src/kinetis/kinetis_pinirq.c
index 45b8136e5a..9b5724ffc3 100644
--- a/arch/arm/src/kinetis/kinetis_pinirq.c
+++ b/arch/arm/src/kinetis/kinetis_pinirq.c
@@ -48,7 +48,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "kinetis_port.h"
 
 #ifdef CONFIG_GPIO_IRQ
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index f457c5c895..b70be54f58 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -60,7 +60,7 @@
 #include "chip.h"
 #include "up_arch.h"
 
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "kinetis_pinmux.h"
 #include "kinetis_sim.h"
 #include "kinetis_sdhc.h"
diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c
index 4c4778836d..3f4e606ce4 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -60,7 +60,7 @@
 #include "kinetis_config.h"
 #include "chip.h"
 #include "kinetis_uart.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/kinetis/kinetis_start.c b/arch/arm/src/kinetis/kinetis_start.c
index 425a6c6b4b..f686e77915 100644
--- a/arch/arm/src/kinetis/kinetis_start.c
+++ b/arch/arm/src/kinetis/kinetis_start.c
@@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "kinetis_smc.h"
 #include "kinetis_userspace.h"
 
diff --git a/arch/arm/src/kinetis/kinetis_timerisr.c b/arch/arm/src/kinetis/kinetis_timerisr.c
index 659da3e7cb..a418a5e823 100644
--- a/arch/arm/src/kinetis/kinetis_timerisr.c
+++ b/arch/arm/src/kinetis/kinetis_timerisr.c
@@ -52,7 +52,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/kinetis/kinetis_wdog.c b/arch/arm/src/kinetis/kinetis_wdog.c
index f506db2802..b9d49e4251 100644
--- a/arch/arm/src/kinetis/kinetis_wdog.c
+++ b/arch/arm/src/kinetis/kinetis_wdog.c
@@ -43,7 +43,7 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "kinetis_internal.h"
+#include "kinetis.h"
 #include "kinetis_wdog.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc2378/internal.h b/arch/arm/src/lpc2378/lpc2378.h
similarity index 100%
rename from arch/arm/src/lpc2378/internal.h
rename to arch/arm/src/lpc2378/lpc2378.h
diff --git a/arch/arm/src/lpc2378/lpc23xx_decodeirq.c b/arch/arm/src/lpc2378/lpc23xx_decodeirq.c
index 0a311b5526..cff7b0994a 100644
--- a/arch/arm/src/lpc2378/lpc23xx_decodeirq.c
+++ b/arch/arm/src/lpc2378/lpc23xx_decodeirq.c
@@ -54,7 +54,7 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "internal.h"
+#include "lpc2378.h"
 #include "lpc23xx_vic.h"
 
 /********************************************************************************
diff --git a/arch/arm/src/lpc2378/lpc23xx_head.S b/arch/arm/src/lpc2378/lpc23xx_head.S
index 637402fa88..179b390271 100755
--- a/arch/arm/src/lpc2378/lpc23xx_head.S
+++ b/arch/arm/src/lpc2378/lpc23xx_head.S
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "arm.h"
-#include "internal.h"
+#include "lpc2378.h"
 #include "up_arch.h"
 #include "lpc23xx_uart.h"
 #include "lpc23xx_scb.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_irq.c b/arch/arm/src/lpc2378/lpc23xx_irq.c
index 5151384854..a455fef615 100644
--- a/arch/arm/src/lpc2378/lpc23xx_irq.c
+++ b/arch/arm/src/lpc2378/lpc23xx_irq.c
@@ -53,7 +53,7 @@
 #include "chip.h"
 #include "up_arch.h"
 
-#include "internal.h"
+#include "lpc2378.h"
 #include "lpc23xx_vic.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc2378/lpc23xx_pllsetup.c b/arch/arm/src/lpc2378/lpc23xx_pllsetup.c
index b10eb24e39..77b4307961 100644
--- a/arch/arm/src/lpc2378/lpc23xx_pllsetup.c
+++ b/arch/arm/src/lpc2378/lpc23xx_pllsetup.c
@@ -66,7 +66,7 @@
 
 #include "arm.h"
 #include "up_arch.h"
-#include "internal.h"
+#include "lpc2378.h"
 #include "lpc23xx_pinsel.h"
 #include "lpc23xx_scb.h"
 
diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c
index 49230ef855..9e3403c4c9 100644
--- a/arch/arm/src/lpc2378/lpc23xx_serial.c
+++ b/arch/arm/src/lpc2378/lpc23xx_serial.c
@@ -61,7 +61,7 @@
 #include "chip.h"
 #include "up_arch.h"
 
-#include "internal.h"
+#include "lpc2378.h"
 #include "lpc23xx_scb.h"
 #include "lpc23xx_pinsel.h"
 #include "lpc23xx_uart.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_timerisr.c b/arch/arm/src/lpc2378/lpc23xx_timerisr.c
index 55a29b25e2..9ff6cf862a 100644
--- a/arch/arm/src/lpc2378/lpc23xx_timerisr.c
+++ b/arch/arm/src/lpc2378/lpc23xx_timerisr.c
@@ -49,7 +49,7 @@
 #include <arch/board/board.h>
 
 #include "clock/clock.h"
-#include "internal.h"
+#include "lpc2378.h"
 #include "up_arch.h"
 
 #include "lpc23xx_scb.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_internal.h b/arch/arm/src/lpc31xx/lpc31.h
similarity index 98%
rename from arch/arm/src/lpc31xx/lpc31_internal.h
rename to arch/arm/src/lpc31xx/lpc31.h
index 723833364e..a2ba074718 100644
--- a/arch/arm/src/lpc31xx/lpc31_internal.h
+++ b/arch/arm/src/lpc31xx/lpc31.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc31xx/lpc31_internal.h
+ * arch/arm/src/lpc31xx/lpc31.h
  *
  *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC31XX_LPC31_INTERNAL_H
-#define __ARCH_ARM_SRC_LPC31XX_LPC31_INTERNAL_H
+#ifndef __ARCH_ARM_SRC_LPC31XX_LPC31_H
+#define __ARCH_ARM_SRC_LPC31XX_LPC31_H
 
 /************************************************************************************
  * Included Files
@@ -353,4 +353,4 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC31XX_LPC31_INTERNAL_H */
+#endif /* __ARCH_ARM_SRC_LPC31XX_LPC31_H */
diff --git a/arch/arm/src/lpc31xx/lpc31_boot.c b/arch/arm/src/lpc31xx/lpc31_boot.c
index 643c4131fd..7a28e2f9ea 100644
--- a/arch/arm/src/lpc31xx/lpc31_boot.c
+++ b/arch/arm/src/lpc31xx/lpc31_boot.c
@@ -49,7 +49,7 @@
 
 #include "lpc31_syscreg.h"
 #include "lpc31_cgudrvr.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"
 
 #ifdef CONFIG_PAGING
 #  include <nuttx/page.h>
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index 0f4bbed663..1d2fe2a45a 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -61,7 +61,7 @@
 #include "cache.h"
 
 #include "chip.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"
 #include "lpc31_cgudrvr.h"
 #include "lpc31_syscreg.h"
 #include "lpc31_evntrtr.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_irq.c b/arch/arm/src/lpc31xx/lpc31_irq.c
index f0ad81bc4f..f8009fe370 100644
--- a/arch/arm/src/lpc31xx/lpc31_irq.c
+++ b/arch/arm/src/lpc31xx/lpc31_irq.c
@@ -53,7 +53,7 @@
 
 #include "lpc31_intc.h"
 #include "lpc31_cgudrvr.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc31xx/lpc31_timerisr.c b/arch/arm/src/lpc31xx/lpc31_timerisr.c
index 1b7c489667..a2607f6266 100644
--- a/arch/arm/src/lpc31xx/lpc31_timerisr.c
+++ b/arch/arm/src/lpc31xx/lpc31_timerisr.c
@@ -51,7 +51,7 @@
 #include "up_arch.h"
 
 #include "lpc31_timer.h"
-#include "lpc31_internal.h"
+#include "lpc31.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c
index ed6bca63e1..bdb3795ed0 100644
--- a/arch/arm/src/sama5/sam_twi.c
+++ b/arch/arm/src/sama5/sam_twi.c
@@ -1044,7 +1044,7 @@ static int twi_writeread(FAR struct i2c_dev_s *dev, const uint8_t *wbuffer,
   msgv[0].buffer = (uint8_t *)wbuffer;  /* Override const */
   msgv[0].length = wbuflen;
 
-  /* The second is either a read (rbuflen > 0) or a write (rbuflen < 0) with
+  /* The second is either a read (rbuflen > 0) or a write (rbuflen <= 0) with
    * no restart.
    */
 
@@ -1066,7 +1066,7 @@ static int twi_writeread(FAR struct i2c_dev_s *dev, const uint8_t *wbuffer,
 
   twi_takesem(&priv->exclsem);
 
-  /* Initiate the read */
+  /* Perform the write-read */
 
   priv->msg  = msgv;
   priv->msgc = 2;
diff --git a/arch/arm/src/str71x/str71x_internal.h b/arch/arm/src/str71x/str71x.h
similarity index 96%
rename from arch/arm/src/str71x/str71x_internal.h
rename to arch/arm/src/str71x/str71x.h
index 51f508ae35..a80be0c9b5 100644
--- a/arch/arm/src/str71x/str71x_internal.h
+++ b/arch/arm/src/str71x/str71x.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/str71x/str71x_internal.h
+ * arch/arm/src/str71x/str71x.h
  *
  *   Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STR71X_STR71X_INTERNAL_H
-#define __ARCH_ARM_SRC_STR71X_STR71X_INTERNAL_H
+#ifndef __ARCH_ARM_SRC_STR71X_STR71X_H
+#define __ARCH_ARM_SRC_STR71X_STR71X_H
 
 /************************************************************************************
  * Included Files
@@ -153,4 +153,4 @@ void str71x_disable_xtiirq(int irq);
 #  define str71x_disable_xtiirq(irq)
 #endif /* CONFIG_STR71X_XTI */
 
-#endif /* __ARCH_ARM_SRC_STR71X_STR71X_INTERNAL_H */
+#endif /* __ARCH_ARM_SRC_STR71X_STR71X_H */
diff --git a/arch/arm/src/str71x/str71x_irq.c b/arch/arm/src/str71x/str71x_irq.c
index 4bbf63d8c5..ac3c63de2c 100644
--- a/arch/arm/src/str71x/str71x_irq.c
+++ b/arch/arm/src/str71x/str71x_irq.c
@@ -48,7 +48,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "str71x_internal.h"
+#include "str71x.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/str71x/str71x_lowputc.c b/arch/arm/src/str71x/str71x_lowputc.c
index e80429576f..787aafe2cf 100644
--- a/arch/arm/src/str71x/str71x_lowputc.c
+++ b/arch/arm/src/str71x/str71x_lowputc.c
@@ -44,7 +44,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "str71x_internal.h"
+#include "str71x.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/str71x/str71x_prccu.c b/arch/arm/src/str71x/str71x_prccu.c
index 0a6a5c3094..0d9184cc25 100644
--- a/arch/arm/src/str71x/str71x_prccu.c
+++ b/arch/arm/src/str71x/str71x_prccu.c
@@ -48,7 +48,7 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "str71x_internal.h"
+#include "str71x.h"
 
 /********************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c
index d36b1202ee..2d80e0440b 100644
--- a/arch/arm/src/str71x/str71x_serial.c
+++ b/arch/arm/src/str71x/str71x_serial.c
@@ -56,7 +56,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "str71x_internal.h"
+#include "str71x.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/str71x/str71x_timerisr.c b/arch/arm/src/str71x/str71x_timerisr.c
index 335014d1dc..a2f55ec966 100644
--- a/arch/arm/src/str71x/str71x_timerisr.c
+++ b/arch/arm/src/str71x/str71x_timerisr.c
@@ -50,7 +50,7 @@
 #include "clock/clock.h"
 #include "up_internal.h"
 
-#include "str71x_internal.h"
+#include "str71x.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/str71x/str71x_xti.c b/arch/arm/src/str71x/str71x_xti.c
index 51d14e0866..1bb42e656b 100644
--- a/arch/arm/src/str71x/str71x_xti.c
+++ b/arch/arm/src/str71x/str71x_xti.c
@@ -51,7 +51,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "str71x_internal.h"
+#include "str71x.h"
 
 #ifdef CONFIG_STR71X_XTI
 
diff --git a/arch/avr/src/at32uc3/at32uc3_internal.h b/arch/avr/src/at32uc3/at32uc3.h
similarity index 98%
rename from arch/avr/src/at32uc3/at32uc3_internal.h
rename to arch/avr/src/at32uc3/at32uc3.h
index 2331005815..47ecb3ad03 100644
--- a/arch/avr/src/at32uc3/at32uc3_internal.h
+++ b/arch/avr/src/at32uc3/at32uc3.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/avr/src/at32uc3/at32uc3_internal.h
+ * arch/avr/src/at32uc3/at32uc3.h
  *
  *   Copyright (C) 2010, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_AVR_SRC_AT32UC3_AT32UC3_INTERNAL_H
-#define __ARCH_AVR_SRC_AT32UC3_AT32UC3_INTERNAL_H
+#ifndef __ARCH_AVR_SRC_AT32UC3_AT32UC3_H
+#define __ARCH_AVR_SRC_AT32UC3_AT32UC3_H
 
 /****************************************************************************
  * Included Files
@@ -341,5 +341,5 @@ void gpio_irqdisable(int irq);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_AVR_SRC_AT32UC3_AT32UC3_INTERNAL_H */
+#endif /* __ARCH_AVR_SRC_AT32UC3_AT32UC3_H */
 
diff --git a/arch/avr/src/at32uc3/at32uc3_clkinit.c b/arch/avr/src/at32uc3/at32uc3_clkinit.c
index 62848010e3..ede74c7492 100644
--- a/arch/avr/src/at32uc3/at32uc3_clkinit.c
+++ b/arch/avr/src/at32uc3/at32uc3_clkinit.c
@@ -45,7 +45,7 @@
 
 #include "at32uc3_config.h"
 #include "up_internal.h"
-#include "at32uc3_internal.h"
+#include "at32uc3.h"
 #include "at32uc3_pm.h"
 #include "at32uc3_flashc.h"
 
diff --git a/arch/avr/src/at32uc3/at32uc3_gpio.c b/arch/avr/src/at32uc3/at32uc3_gpio.c
index 0ad8125da8..a1a7e07aff 100644
--- a/arch/avr/src/at32uc3/at32uc3_gpio.c
+++ b/arch/avr/src/at32uc3/at32uc3_gpio.c
@@ -44,7 +44,7 @@
 
 #include "at32uc3_config.h"
 #include "up_internal.h"
-#include "at32uc3_internal.h"
+#include "at32uc3.h"
 
 #include "up_arch.h"
 #include "chip.h"
diff --git a/arch/avr/src/at32uc3/at32uc3_gpioirq.c b/arch/avr/src/at32uc3/at32uc3_gpioirq.c
index 3d8285856e..f03b8f789f 100644
--- a/arch/avr/src/at32uc3/at32uc3_gpioirq.c
+++ b/arch/avr/src/at32uc3/at32uc3_gpioirq.c
@@ -51,7 +51,7 @@
 
 #include "up_arch.h"
 #include "irq/irq.h"
-#include "at32uc3_internal.h"
+#include "at32uc3.h"
 #include "at32uc3_gpio.h"
 
 #ifdef CONFIG_AVR32_GPIOIRQ
diff --git a/arch/avr/src/at32uc3/at32uc3_irq.c b/arch/avr/src/at32uc3/at32uc3_irq.c
index 127d1ae99e..342b796e54 100644
--- a/arch/avr/src/at32uc3/at32uc3_irq.c
+++ b/arch/avr/src/at32uc3/at32uc3_irq.c
@@ -51,7 +51,7 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "at32uc3_internal.h"
+#include "at32uc3.h"
 
 #include "chip.h"
 #include "at32uc3_intc.h"
diff --git a/arch/avr/src/at32uc3/at32uc3_lowconsole.c b/arch/avr/src/at32uc3/at32uc3_lowconsole.c
index 58c7e067ed..e3a00edde7 100644
--- a/arch/avr/src/at32uc3/at32uc3_lowconsole.c
+++ b/arch/avr/src/at32uc3/at32uc3_lowconsole.c
@@ -48,7 +48,7 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "at32uc3_internal.h"
+#include "at32uc3.h"
 #include "at32uc3_pm.h"
 #include "at32uc3_usart.h"
 #include "at32uc3_pinmux.h"
diff --git a/arch/avr/src/at32uc3/at32uc3_lowinit.c b/arch/avr/src/at32uc3/at32uc3_lowinit.c
index 0ab2bc2c44..155deb7752 100644
--- a/arch/avr/src/at32uc3/at32uc3_lowinit.c
+++ b/arch/avr/src/at32uc3/at32uc3_lowinit.c
@@ -41,7 +41,7 @@
 
 #include "at32uc3_config.h"
 #include "up_internal.h"
-#include "at32uc3_internal.h"
+#include "at32uc3.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/at32uc3/at32uc3_serial.c b/arch/avr/src/at32uc3/at32uc3_serial.c
index 5631446272..db5ce22495 100644
--- a/arch/avr/src/at32uc3/at32uc3_serial.c
+++ b/arch/avr/src/at32uc3/at32uc3_serial.c
@@ -59,7 +59,7 @@
 #include "at32uc3_usart.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "at32uc3_internal.h"
+#include "at32uc3.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/at32uc3/at32uc3_timerisr.c b/arch/avr/src/at32uc3/at32uc3_timerisr.c
index c8ec47edcb..e0d6cc6c35 100644
--- a/arch/avr/src/at32uc3/at32uc3_timerisr.c
+++ b/arch/avr/src/at32uc3/at32uc3_timerisr.c
@@ -47,7 +47,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "at32uc3_internal.h"
+#include "at32uc3.h"
 #include "at32uc3_pm.h"
 #include "at32uc3_rtc.h"
 
diff --git a/arch/avr/src/at90usb/at90usb_internal.h b/arch/avr/src/at90usb/at90usb.h
similarity index 97%
rename from arch/avr/src/at90usb/at90usb_internal.h
rename to arch/avr/src/at90usb/at90usb.h
index 0967fb01ab..2f2fc208e7 100644
--- a/arch/avr/src/at90usb/at90usb_internal.h
+++ b/arch/avr/src/at90usb/at90usb.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/avr/src/at90usb/at90usb_internal.h
+ * arch/avr/src/at90usb/at90usb.h
  *
  *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_AVR_SRC_ATMEGA_ATMEGA_INTERNAL_H
-#define __ARCH_AVR_SRC_ATMEGA_ATMEGA_INTERNAL_H
+#ifndef __ARCH_AVR_SRC_ATMEGA_ATMEGA_H
+#define __ARCH_AVR_SRC_ATMEGA_ATMEGA_H
 
 /****************************************************************************
  * Included Files
@@ -208,5 +208,5 @@ void gpio_irqdisable(int irq);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_AVR_SRC_ATMEGA_ATMEGA_INTERNAL_H */
+#endif /* __ARCH_AVR_SRC_ATMEGA_ATMEGA_H */
 
diff --git a/arch/avr/src/at90usb/at90usb_lowconsole.c b/arch/avr/src/at90usb/at90usb_lowconsole.c
index c40328ec23..0fc4e18d9c 100644
--- a/arch/avr/src/at90usb/at90usb_lowconsole.c
+++ b/arch/avr/src/at90usb/at90usb_lowconsole.c
@@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "at90usb_internal.h"
+#include "at90usb.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/at90usb/at90usb_lowinit.c b/arch/avr/src/at90usb/at90usb_lowinit.c
index 2d49736f5f..e8559225e7 100644
--- a/arch/avr/src/at90usb/at90usb_lowinit.c
+++ b/arch/avr/src/at90usb/at90usb_lowinit.c
@@ -43,7 +43,7 @@
 
 #include "at90usb_config.h"
 #include "up_internal.h"
-#include "at90usb_internal.h"
+#include "at90usb.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/at90usb/at90usb_serial.c b/arch/avr/src/at90usb/at90usb_serial.c
index 4b4c361768..0ead03b0f0 100644
--- a/arch/avr/src/at90usb/at90usb_serial.c
+++ b/arch/avr/src/at90usb/at90usb_serial.c
@@ -58,7 +58,7 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "at90usb_internal.h"
+#include "at90usb.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/at90usb/at90usb_timerisr.c b/arch/avr/src/at90usb/at90usb_timerisr.c
index 824fc074a7..0c53d2386c 100644
--- a/arch/avr/src/at90usb/at90usb_timerisr.c
+++ b/arch/avr/src/at90usb/at90usb_timerisr.c
@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 
-#include "at90usb_internal.h"
+#include "at90usb.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/atmega/atmega_internal.h b/arch/avr/src/atmega/atmega.h
similarity index 97%
rename from arch/avr/src/atmega/atmega_internal.h
rename to arch/avr/src/atmega/atmega.h
index 2eedba3b9d..621e6f335e 100644
--- a/arch/avr/src/atmega/atmega_internal.h
+++ b/arch/avr/src/atmega/atmega.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/avr/src/atmega/atmega_internal.h
+ * arch/avr/src/atmega/atmega.h
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_AVR_SRC_ATMEGA_ATMEGA_INTERNAL_H
-#define __ARCH_AVR_SRC_ATMEGA_ATMEGA_INTERNAL_H
+#ifndef __ARCH_AVR_SRC_ATMEGA_ATMEGA_H
+#define __ARCH_AVR_SRC_ATMEGA_ATMEGA_H
 
 /****************************************************************************
  * Included Files
@@ -210,5 +210,5 @@ void gpio_irqdisable(int irq);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_AVR_SRC_ATMEGA_ATMEGA_INTERNAL_H */
+#endif /* __ARCH_AVR_SRC_ATMEGA_ATMEGA_H */
 
diff --git a/arch/avr/src/atmega/atmega_lowconsole.c b/arch/avr/src/atmega/atmega_lowconsole.c
index 17f1b0145f..ab4b70ec3c 100644
--- a/arch/avr/src/atmega/atmega_lowconsole.c
+++ b/arch/avr/src/atmega/atmega_lowconsole.c
@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "atmega_internal.h"
+#include "atmega.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/atmega/atmega_lowinit.c b/arch/avr/src/atmega/atmega_lowinit.c
index 859f34a497..1a1efb0afc 100644
--- a/arch/avr/src/atmega/atmega_lowinit.c
+++ b/arch/avr/src/atmega/atmega_lowinit.c
@@ -43,7 +43,7 @@
 
 #include "atmega_config.h"
 #include "up_internal.h"
-#include "atmega_internal.h"
+#include "atmega.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/atmega/atmega_serial.c b/arch/avr/src/atmega/atmega_serial.c
index 6d2ae31589..062af4b8fb 100644
--- a/arch/avr/src/atmega/atmega_serial.c
+++ b/arch/avr/src/atmega/atmega_serial.c
@@ -58,7 +58,7 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "atmega_internal.h"
+#include "atmega.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/atmega/atmega_timerisr.c b/arch/avr/src/atmega/atmega_timerisr.c
index 51d69e823d..c0572b030a 100644
--- a/arch/avr/src/atmega/atmega_timerisr.c
+++ b/arch/avr/src/atmega/atmega_timerisr.c
@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 
-#include "atmega_internal.h"
+#include "atmega.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/avr/avr_internal.h b/arch/avr/src/avr/avr.h
similarity index 97%
rename from arch/avr/src/avr/avr_internal.h
rename to arch/avr/src/avr/avr.h
index a7d000ec1a..da24bcc839 100644
--- a/arch/avr/src/avr/avr_internal.h
+++ b/arch/avr/src/avr/avr.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/avr/src/avr/avr_internal.h
+ * arch/avr/src/avr/avr.h
  *
  *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_AVR_SRC_AVR_AVR_INTERNAL_H
-#define __ARCH_AVR_SRC_AVR_AVR_INTERNAL_H
+#ifndef __ARCH_AVR_SRC_AVR_AVR_H
+#define __ARCH_AVR_SRC_AVR_AVR_H
 
 /****************************************************************************
  * Included Files
@@ -175,5 +175,5 @@ int avr_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif  /* __ARCH_AVR_SRC_AVR_AVR_INTERNAL_H */
+#endif  /* __ARCH_AVR_SRC_AVR_AVR_H */
 
diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c
index dd22a44f21..317a6fe36f 100644
--- a/arch/avr/src/avr/up_spi.c
+++ b/arch/avr/src/avr/up_spi.c
@@ -57,7 +57,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "avr_internal.h"
+#include "avr.h"
 
 #ifdef CONFIG_AVR_SPI
 
diff --git a/arch/avr/src/avr32/avr32_internal.h b/arch/avr/src/avr32/avr32.h
similarity index 96%
rename from arch/avr/src/avr32/avr32_internal.h
rename to arch/avr/src/avr32/avr32.h
index f6078e881a..403113c2b3 100644
--- a/arch/avr/src/avr32/avr32_internal.h
+++ b/arch/avr/src/avr32/avr32.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/avr/src/avr32/up_internal.h
+ * arch/avr/src/avr32/avr32.h
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_AVR_SRC_AVR32_AVR32_INTERNAL_H
-#define __ARCH_AVR_SRC_AVR32_AVR32_INTERNAL_H
+#ifndef __ARCH_AVR_SRC_AVR32_AVR32_H
+#define __ARCH_AVR_SRC_AVR32_AVR32_H
 
 /****************************************************************************
  * Included Files
@@ -135,5 +135,5 @@ void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
 uint32_t *up_doirq(int irq, uint32_t *regs);
 
 #endif /* __ASSEMBLY__ */
-#endif  /* __ARCH_AVR_SRC_AVR32_AVR32_INTERNAL_H */
+#endif  /* __ARCH_AVR_SRC_AVR32_AVR32_H */
 
diff --git a/arch/avr/src/common/up_internal.h b/arch/avr/src/common/up_internal.h
index c2beb82671..bc6a7ebf25 100644
--- a/arch/avr/src/common/up_internal.h
+++ b/arch/avr/src/common/up_internal.h
@@ -47,9 +47,9 @@
 #endif
 
 #ifdef CONFIG_ARCH_FAMILY_AVR32
-# include "avr32_internal.h"
+# include "avr32.h"
 #else
-# include "avr_internal.h"
+# include "avr.h"
 #endif
 
 /****************************************************************************
diff --git a/arch/hc/src/m9s12/m9s12_internal.h b/arch/hc/src/m9s12/m9s12.h
similarity index 98%
rename from arch/hc/src/m9s12/m9s12_internal.h
rename to arch/hc/src/m9s12/m9s12.h
index 8b6788474d..259db6d525 100644
--- a/arch/hc/src/m9s12/m9s12_internal.h
+++ b/arch/hc/src/m9s12/m9s12.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/hc/src/m9s12/m9s12_internal.h
+ * arch/hc/src/m9s12/m9s12.h
  *
  *   Copyright (C) 2009, 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_HC_SRC_M9S12_M9S12_INTERNAL_H
-#define __ARCH_HC_SRC_M9S12_M9S12_INTERNAL_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_H
+#define __ARCH_HC_SRC_M9S12_M9S12_H
 
 /************************************************************************************
  * Included Files
@@ -357,4 +357,4 @@ uint8_t hcs12_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_HC_SRC_M9S12_M9S12_INTERNAL_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_H */
diff --git a/arch/hc/src/m9s12/m9s12_dumpgpio.c b/arch/hc/src/m9s12/m9s12_dumpgpio.c
index 57a577ccb4..c4fc20ba9e 100644
--- a/arch/hc/src/m9s12/m9s12_dumpgpio.c
+++ b/arch/hc/src/m9s12/m9s12_dumpgpio.c
@@ -45,7 +45,7 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "m9s12_internal.h"
+#include "m9s12.h"
 #include "m9s12_pim.h"
 #include "m9s12_mebi.h"
 
diff --git a/arch/hc/src/m9s12/m9s12_gpio.c b/arch/hc/src/m9s12/m9s12_gpio.c
index a96d8a8a3f..f4de391d50 100644
--- a/arch/hc/src/m9s12/m9s12_gpio.c
+++ b/arch/hc/src/m9s12/m9s12_gpio.c
@@ -48,7 +48,7 @@
 #include <nuttx/arch.h>
 
 #include "up_arch.h"
-#include "m9s12_internal.h"
+#include "m9s12.h"
 #include "m9s12_pim.h"
 #include "m9s12_mebi.h"
 
diff --git a/arch/hc/src/m9s12/m9s12_gpioirq.c b/arch/hc/src/m9s12/m9s12_gpioirq.c
index 9b8448991f..cf50615682 100644
--- a/arch/hc/src/m9s12/m9s12_gpioirq.c
+++ b/arch/hc/src/m9s12/m9s12_gpioirq.c
@@ -48,7 +48,7 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "m9s12_internal.h"
+#include "m9s12.h"
 #include "m9s12_pim.h"
 #include "m9s12_mebi.h"
 
diff --git a/arch/hc/src/m9s12/m9s12_irq.c b/arch/hc/src/m9s12/m9s12_irq.c
index 846034b2c5..1349503865 100644
--- a/arch/hc/src/m9s12/m9s12_irq.c
+++ b/arch/hc/src/m9s12/m9s12_irq.c
@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "m9s12_internal.h"
+#include "m9s12.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/hc/src/m9s12/m9s12_lowputc.S b/arch/hc/src/m9s12/m9s12_lowputc.S
index 55500e17e1..f5b495da74 100755
--- a/arch/hc/src/m9s12/m9s12_lowputc.S
+++ b/arch/hc/src/m9s12/m9s12_lowputc.S
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include "up_internal.h"
-#include "m9s12_internal.h"
+#include "m9s12.h"
 #include "m9s12_sci.h"
 #include "m9s12_serial.h"
 
diff --git a/arch/hc/src/m9s12/m9s12_saveusercontext.S b/arch/hc/src/m9s12/m9s12_saveusercontext.S
index aef92b1350..8797cd4b04 100755
--- a/arch/hc/src/m9s12/m9s12_saveusercontext.S
+++ b/arch/hc/src/m9s12/m9s12_saveusercontext.S
@@ -42,7 +42,7 @@
 #include <arch/irq.h>
 
 #include "up_internal.h"
-#include "m9s12_internal.h"
+#include "m9s12.h"
 
 /**************************************************************************
  * Pre-processor Definitions
diff --git a/arch/hc/src/m9s12/m9s12_start.S b/arch/hc/src/m9s12/m9s12_start.S
index f72880fe76..49d31b4e1d 100755
--- a/arch/hc/src/m9s12/m9s12_start.S
+++ b/arch/hc/src/m9s12/m9s12_start.S
@@ -42,7 +42,7 @@
 
 #include <arch/board/board.h>
 
-#include "m9s12_internal.h"
+#include "m9s12.h"
 #include "m9s12_mmc.h"
 #include "m9s12_crg.h"
 #include "m9s12_flash.h"
diff --git a/arch/hc/src/m9s12/m9s12_timerisr.c b/arch/hc/src/m9s12/m9s12_timerisr.c
index ee93435f48..c0c74697ff 100644
--- a/arch/hc/src/m9s12/m9s12_timerisr.c
+++ b/arch/hc/src/m9s12/m9s12_timerisr.c
@@ -51,7 +51,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "m9s12_internal.h"
+#include "m9s12.h"
 #include "m9s12_crg.h"
 
 /****************************************************************************
diff --git a/arch/mips/src/pic32mx/pic32mx-decodeirq.c b/arch/mips/src/pic32mx/pic32mx-decodeirq.c
index 13144eb67e..911d9a7fc2 100644
--- a/arch/mips/src/pic32mx/pic32mx-decodeirq.c
+++ b/arch/mips/src/pic32mx/pic32mx-decodeirq.c
@@ -52,7 +52,7 @@
 #include "up_arch.h"
 
 #include "pic32mx-int.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 
 #include "group/group.h"
 
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index 4261730ef6..4dd9d89042 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -71,7 +71,7 @@
 #include "up_arch.h"
 #include "pic32mx-config.h"
 #include "pic32mx-ethernet.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 
 /* Does this chip have and Ethernet controller? */
 
diff --git a/arch/mips/src/pic32mx/pic32mx-exception.c b/arch/mips/src/pic32mx/pic32mx-exception.c
index 0ca9bdfa3e..5d6db95f9c 100644
--- a/arch/mips/src/pic32mx/pic32mx-exception.c
+++ b/arch/mips/src/pic32mx/pic32mx-exception.c
@@ -53,7 +53,7 @@
 #include "up_arch.h"
 
 #include "pic32mx-int.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/mips/src/pic32mx/pic32mx-gpio.c b/arch/mips/src/pic32mx/pic32mx-gpio.c
index d138984aa1..78d9acca22 100644
--- a/arch/mips/src/pic32mx/pic32mx-gpio.c
+++ b/arch/mips/src/pic32mx/pic32mx-gpio.c
@@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "chip.h"
 #include "pic32mx-ioport.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/mips/src/pic32mx/pic32mx-gpioirq.c b/arch/mips/src/pic32mx/pic32mx-gpioirq.c
index f07a97ecaa..f05f251d07 100644
--- a/arch/mips/src/pic32mx/pic32mx-gpioirq.c
+++ b/arch/mips/src/pic32mx/pic32mx-gpioirq.c
@@ -48,7 +48,7 @@
 
 #include "up_arch.h"
 #include "pic32mx-gpio.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 
 #ifdef CONFIG_PIC32MX_GPIOIRQ
 
diff --git a/arch/mips/src/pic32mx/pic32mx-irq.c b/arch/mips/src/pic32mx/pic32mx-irq.c
index b00335a026..1da0da06f7 100644
--- a/arch/mips/src/pic32mx/pic32mx-irq.c
+++ b/arch/mips/src/pic32mx/pic32mx-irq.c
@@ -54,7 +54,7 @@
 #include "up_internal.h"
 
 #include "pic32mx-int.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/mips/src/pic32mx/pic32mx-lowconsole.c b/arch/mips/src/pic32mx/pic32mx-lowconsole.c
index 4bfe0c9570..d45bbaf97d 100644
--- a/arch/mips/src/pic32mx/pic32mx-lowconsole.c
+++ b/arch/mips/src/pic32mx/pic32mx-lowconsole.c
@@ -49,7 +49,7 @@
 #include "up_internal.h"
 
 #include "pic32mx-config.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/mips/src/pic32mx/pic32mx-lowinit.c b/arch/mips/src/pic32mx/pic32mx-lowinit.c
index 8587a20a55..ee04000b60 100644
--- a/arch/mips/src/pic32mx/pic32mx-lowinit.c
+++ b/arch/mips/src/pic32mx/pic32mx-lowinit.c
@@ -47,7 +47,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-bmx.h"
 #include "pic32mx-che.h"
 
diff --git a/arch/mips/src/pic32mx/pic32mx-serial.c b/arch/mips/src/pic32mx/pic32mx-serial.c
index f706bace0f..bb281e78dc 100644
--- a/arch/mips/src/pic32mx/pic32mx-serial.c
+++ b/arch/mips/src/pic32mx/pic32mx-serial.c
@@ -64,7 +64,7 @@
 #include "pic32mx-config.h"
 #include "chip.h"
 #include "pic32mx-uart.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/mips/src/pic32mx/pic32mx-spi.c b/arch/mips/src/pic32mx/pic32mx-spi.c
index bcaf0b7d39..49be87a16a 100644
--- a/arch/mips/src/pic32mx/pic32mx-spi.c
+++ b/arch/mips/src/pic32mx/pic32mx-spi.c
@@ -54,7 +54,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-spi.h"
 
 #if defined(CONFIG_PIC32MX_SPI1) || defined(CONFIG_PIC32MX_SPI2) || \
diff --git a/arch/mips/src/pic32mx/pic32mx-timerisr.c b/arch/mips/src/pic32mx/pic32mx-timerisr.c
index e632869e1c..4543c638e4 100644
--- a/arch/mips/src/pic32mx/pic32mx-timerisr.c
+++ b/arch/mips/src/pic32mx/pic32mx-timerisr.c
@@ -53,7 +53,7 @@
 #include "pic32mx-config.h"
 #include "pic32mx-timer.h"
 #include "pic32mx-int.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/mips/src/pic32mx/pic32mx-usbdev.c b/arch/mips/src/pic32mx/pic32mx-usbdev.c
index 20ba256596..9117f70b26 100644
--- a/arch/mips/src/pic32mx/pic32mx-usbdev.c
+++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c
@@ -65,7 +65,7 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "pic32mx-internal.h"
+#include "pic32mx.h"
 #include "pic32mx-usbotg.h"
 
 #if defined(CONFIG_USBDEV) && defined(CONFIG_PIC32MX_USBDEV)
diff --git a/arch/mips/src/pic32mx/pic32mx-internal.h b/arch/mips/src/pic32mx/pic32mx.h
similarity index 99%
rename from arch/mips/src/pic32mx/pic32mx-internal.h
rename to arch/mips/src/pic32mx/pic32mx.h
index e48b0505d7..f03cc31288 100644
--- a/arch/mips/src/pic32mx/pic32mx-internal.h
+++ b/arch/mips/src/pic32mx/pic32mx.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/mips/src/pic32mx/pic32mx-internal.h
+ * arch/mips/src/pic32mx/pic32mx.h
  *
  *   Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_MIPS_SRC_PIC32MX_PIC32MX_INTERNAL_H
-#define __ARCH_MIPS_SRC_PIC32MX_PIC32MX_INTERNAL_H
+#ifndef __ARCH_MIPS_SRC_PIC32MX_PIC32MX_H
+#define __ARCH_MIPS_SRC_PIC32MX_PIC32MX_H
 
 /************************************************************************************
  * Included Files
@@ -622,4 +622,4 @@ void pic32mx_usbdetach(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_MIPS_SRC_PIC32MX_PIC32MX_INTERNAL_H */
+#endif /* __ARCH_MIPS_SRC_PIC32MX_PIC32MX_H */
diff --git a/arch/x86/src/i486/up_irq.c b/arch/x86/src/i486/up_irq.c
index 4322b5a963..c32fc86b49 100644
--- a/arch/x86/src/i486/up_irq.c
+++ b/arch/x86/src/i486/up_irq.c
@@ -52,7 +52,7 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "qemu_internal.h"
+#include "qemu.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/x86/src/qemu/qemu_internal.h b/arch/x86/src/qemu/qemu.h
similarity index 98%
rename from arch/x86/src/qemu/qemu_internal.h
rename to arch/x86/src/qemu/qemu.h
index fc6d50bdc2..d764189313 100644
--- a/arch/x86/src/qemu/qemu_internal.h
+++ b/arch/x86/src/qemu/qemu.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/x86/src/qemu/qemu_internal.h
+ * arch/x86/src/qemu/qemu.h
  *
  *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_X86_SRC_QEMU_QEMU_INTERNAL_H
-#define __ARCH_X86_SRC_QEMU_QEMU_INTERNAL_H
+#ifndef __ARCH_X86_SRC_QEMU_QEMU_H
+#define __ARCH_X86_SRC_QEMU_QEMU_H
 
 /************************************************************************************
  * Included Files
@@ -444,4 +444,4 @@ void vector_irq15(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_X86_SRC_QEMU_QEMU_INTERNAL_H */
+#endif /* __ARCH_X86_SRC_QEMU_QEMU_H */
diff --git a/arch/x86/src/qemu/qemu_timerisr.c b/arch/x86/src/qemu/qemu_timerisr.c
index ee72f66993..adf844d24c 100644
--- a/arch/x86/src/qemu/qemu_timerisr.c
+++ b/arch/x86/src/qemu/qemu_timerisr.c
@@ -56,7 +56,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "qemu_internal.h"
+#include "qemu.h"
 
 /****************************************************************************
  * Pre-processor Definitions