diff --git a/configs/pic32mx7mmb/src/Makefile b/configs/pic32mx7mmb/src/Makefile
index d21852aef5..73408883fb 100644
--- a/configs/pic32mx7mmb/src/Makefile
+++ b/configs/pic32mx7mmb/src/Makefile
@@ -35,43 +35,43 @@
 
 -include $(TOPDIR)/Make.defs
 
-CFLAGS		+= -I$(TOPDIR)/sched
+CFLAGS += -I$(TOPDIR)/sched
 
-ASRCS		=
-CSRCS		= up_boot.c up_leds.c up_spi.c up_mio283qt2.c
+ASRCS =
+CSRCS = pic32_boot.c pic32_leds.c pic32_spi.c pic32_mio283qt2.c
 
 ifeq ($(CONFIG_PIC32MX_USBDEV),y)
-CSRCS		+= up_usbdev.c
+CSRCS += pic32_usbdev.c
 ifeq ($(CONFIG_EXAMPLES_USBTERM_DEVINIT),y)
-CSRCS		+= up_usbterm.c
+CSRCS += pic32_usbterm.c
 endif
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += pic32_nsh.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbmsc.c
+CSRCS += pic32_usbmsc.c
 endif
 
 ifeq ($(CONFIG_INPUT),y)
-CSRCS		+= up_touchscreen.c
+CSRCS += pic32_touchscreen.c
 endif
 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
+ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/mips32}"
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/mips32}"
 else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/mips32
+  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/mips32
 endif
 
 all: libboard$(LIBEXT)
diff --git a/configs/pic32mx7mmb/src/up_boot.c b/configs/pic32mx7mmb/src/pic32_boot.c
similarity index 97%
rename from configs/pic32mx7mmb/src/up_boot.c
rename to configs/pic32mx7mmb/src/pic32_boot.c
index 426a707616..1a8f9aef79 100644
--- a/configs/pic32mx7mmb/src/up_boot.c
+++ b/configs/pic32mx7mmb/src/pic32_boot.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/pic32mx7mmb/src/up_boot.c
- * arch/mips/src/board/up_boot.c
+ * configs/pic32mx7mmb/src/pic32_boot.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +50,7 @@
 #include "pic32mx7mmb_internal.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
diff --git a/configs/pic32mx7mmb/src/up_leds.c b/configs/pic32mx7mmb/src/pic32_leds.c
similarity index 99%
rename from configs/pic32mx7mmb/src/up_leds.c
rename to configs/pic32mx7mmb/src/pic32_leds.c
index 88928d073e..c73509726e 100644
--- a/configs/pic32mx7mmb/src/up_leds.c
+++ b/configs/pic32mx7mmb/src/pic32_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/pic32mx7mmb/src/up_leds.c
+ * configs/pic32mx7mmb/src/pic32_leds.c
  *
  *   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/pic32mx7mmb/src/up_mio283qt2.c b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
similarity index 99%
rename from configs/pic32mx7mmb/src/up_mio283qt2.c
rename to configs/pic32mx7mmb/src/pic32_mio283qt2.c
index 61e861eb3f..ff0e10ac2a 100644
--- a/configs/pic32mx7mmb/src/up_mio283qt2.c
+++ b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
@@ -1,6 +1,5 @@
 /**************************************************************************************
- * configs/stm32fdiscover/src/up_mio283qt2.c
- * arch/arm/src/board/up_mio283qt2.c
+ * configs/stm32fdiscover/src/pic32_mio283qt2.c
  *
  * Interface definition for the MI0283QT-2 LCD from Multi-Inno Technology Co., Ltd.
  * This LCD is based on the Himax HX8347-D LCD controller.
diff --git a/configs/pic32mx7mmb/src/up_nsh.c b/configs/pic32mx7mmb/src/pic32_nsh.c
similarity index 99%
rename from configs/pic32mx7mmb/src/up_nsh.c
rename to configs/pic32mx7mmb/src/pic32_nsh.c
index c6e1ec5503..dba613e27a 100644
--- a/configs/pic32mx7mmb/src/up_nsh.c
+++ b/configs/pic32mx7mmb/src/pic32_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/pic32mx7mmb/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/pic32mx7mmb/src/pic32_nsh.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -53,7 +52,7 @@
 #include "pic32mx7mmb_internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
 /* Assume that we have MMC/SD, USB host (and USB device) */
diff --git a/configs/pic32mx7mmb/src/up_spi.c b/configs/pic32mx7mmb/src/pic32_spi.c
similarity index 99%
rename from configs/pic32mx7mmb/src/up_spi.c
rename to configs/pic32mx7mmb/src/pic32_spi.c
index 1b7345fc9e..28f8f3486c 100644
--- a/configs/pic32mx7mmb/src/up_spi.c
+++ b/configs/pic32mx7mmb/src/pic32_spi.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/pic32mx7mmb/src/up_spi.c
- * arch/arm/src/board/up_spi.c
+ * configs/pic32mx7mmb/src/pic32_spi.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -56,7 +55,7 @@
     defined(CONFIG_PIC32MX_SPI3) || defined(CONFIG_PIC32MX_SPI4)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /* SPI1 and SD Card
  *
diff --git a/configs/pic32mx7mmb/src/up_touchscreen.c b/configs/pic32mx7mmb/src/pic32_touchscreen.c
similarity index 99%
rename from configs/pic32mx7mmb/src/up_touchscreen.c
rename to configs/pic32mx7mmb/src/pic32_touchscreen.c
index 532e612cb8..e4b8a2d64d 100644
--- a/configs/pic32mx7mmb/src/up_touchscreen.c
+++ b/configs/pic32mx7mmb/src/pic32_touchscreen.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/pic32mx7mmb/src/up_boot.c
- * arch/mips/src/board/up_boot.c
+ * configs/pic32mx7mmb/src/pic32_touchscreen.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -66,7 +65,7 @@
 #ifdef CONFIG_INPUT
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /* Configuration ********************************************************************/
 /* Reference counting is partially implemented, but not needed in the current design.
diff --git a/configs/pic32mx7mmb/src/up_usbdev.c b/configs/pic32mx7mmb/src/pic32_usbdev.c
similarity index 98%
rename from configs/pic32mx7mmb/src/up_usbdev.c
rename to configs/pic32mx7mmb/src/pic32_usbdev.c
index c6e4cc3e08..0296292c95 100644
--- a/configs/pic32mx7mmb/src/up_usbdev.c
+++ b/configs/pic32mx7mmb/src/pic32_usbdev.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/pic32mx7mmb/src/up_usbdev.c
- * arch/arm/src/board/up_usbdev.c
+ * configs/pic32mx7mmb/src/pic32_usbdev.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +50,7 @@
 #if defined(CONFIG_PIC32MX_USBDEV)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /*
  * PIN  NAME                            SIGNAL         NOTES
diff --git a/configs/pic32mx7mmb/src/up_usbmsc.c b/configs/pic32mx7mmb/src/pic32_usbmsc.c
similarity index 97%
rename from configs/pic32mx7mmb/src/up_usbmsc.c
rename to configs/pic32mx7mmb/src/pic32_usbmsc.c
index 3cbb58a115..a8ed56be02 100644
--- a/configs/pic32mx7mmb/src/up_usbmsc.c
+++ b/configs/pic32mx7mmb/src/pic32_usbmsc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/pic32mx7mmb/src/up_usbmsc.c
+ * configs/pic32mx7mmb/src/pic32_usbmsc.c
  *
  *   Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -42,7 +42,7 @@
 #include "pic32mx7mmb_internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/configs/pic32mx7mmb/src/up_usbterm.c b/configs/pic32mx7mmb/src/pic32_usbterm.c
similarity index 97%
rename from configs/pic32mx7mmb/src/up_usbterm.c
rename to configs/pic32mx7mmb/src/pic32_usbterm.c
index 7640befc7c..6860895986 100644
--- a/configs/pic32mx7mmb/src/up_usbterm.c
+++ b/configs/pic32mx7mmb/src/pic32_usbterm.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/pic32mx7mmb/src/up_usbterm.c
- * arch/arm/src/board/up_usbterm.c
+ * configs/pic32mx7mmb/src/pic32_usbterm.c
  *
  *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +50,7 @@
 #if defined(CONFIG_PIC32MX_USBDEV) && defined(CONFIG_EXAMPLES_USBTERM_DEVINIT)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
diff --git a/configs/pic32mx7mmb/src/pic32mx7mmb_internal.h b/configs/pic32mx7mmb/src/pic32mx7mmb_internal.h
index 6c9987da98..1453cc7420 100644
--- a/configs/pic32mx7mmb/src/pic32mx7mmb_internal.h
+++ b/configs/pic32mx7mmb/src/pic32mx7mmb_internal.h
@@ -44,7 +44,7 @@
 #include <nuttx/compiler.h>
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
 /* The Mikroelektronika PIC32MX7 MMB has 3 user LEDs labeled LED0-2 in the