diff --git a/configs/ubw32/src/Makefile b/configs/ubw32/src/Makefile
index c9129a2348..80ee9a09ac 100644
--- a/configs/ubw32/src/Makefile
+++ b/configs/ubw32/src/Makefile
@@ -35,39 +35,39 @@
 
 -include $(TOPDIR)/Make.defs
 
-CFLAGS		+= -I$(TOPDIR)/sched
+CFLAGS += -I$(TOPDIR)/sched
 
-ASRCS		=
-CSRCS		= up_boot.c up_leds.c
+ASRCS =
+CSRCS = pic32_boot.c pic32_leds.c
 
 ifeq ($(CONFIG_ARCH_BUTTONS),y)
-CSRCS		+= up_buttons.c
+CSRCS += pic32_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += pic32_nsh.c
 endif
 
 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
 
-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/ubw32/src/up_boot.c b/configs/ubw32/src/pic32_boot.c
similarity index 97%
rename from configs/ubw32/src/up_boot.c
rename to configs/ubw32/src/pic32_boot.c
index 7e818f2706..c64090b1fe 100644
--- a/configs/ubw32/src/up_boot.c
+++ b/configs/ubw32/src/pic32_boot.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/ubw32/src/up_boot.c
- * arch/mips/src/board/up_boot.c
+ * configs/ubw32/src/pic32_boot.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +50,7 @@
 #include "ubw32-internal.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
diff --git a/configs/ubw32/src/up_buttons.c b/configs/ubw32/src/pic32_buttons.c
similarity index 99%
rename from configs/ubw32/src/up_buttons.c
rename to configs/ubw32/src/pic32_buttons.c
index 9ddab03b47..72a7c86b13 100644
--- a/configs/ubw32/src/up_buttons.c
+++ b/configs/ubw32/src/pic32_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/ubw32/src/board_buttons.c
+ * configs/ubw32/src/pic32_buttons.c
  *
  *   Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ubw32/src/up_leds.c b/configs/ubw32/src/pic32_leds.c
similarity index 99%
rename from configs/ubw32/src/up_leds.c
rename to configs/ubw32/src/pic32_leds.c
index cbaca4a7cb..d8cf7f2691 100644
--- a/configs/ubw32/src/up_leds.c
+++ b/configs/ubw32/src/pic32_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/ubw32/src/up_leds.c
+ * configs/ubw32/src/pic32_leds.c
  *
  *   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ubw32/src/up_nsh.c b/configs/ubw32/src/pic32_nsh.c
similarity index 97%
rename from configs/ubw32/src/up_nsh.c
rename to configs/ubw32/src/pic32_nsh.c
index 64de3cdeff..c64d8f5b8c 100644
--- a/configs/ubw32/src/up_nsh.c
+++ b/configs/ubw32/src/pic32_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/ubw32/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/ubw32/src/pic32_nsh.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -47,7 +46,7 @@
 #include "ubw32-internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/configs/ubw32/src/up_usbdev.c b/configs/ubw32/src/pic32_usbdev.c
similarity index 98%
rename from configs/ubw32/src/up_usbdev.c
rename to configs/ubw32/src/pic32_usbdev.c
index 102f6548d8..216e6f76ca 100644
--- a/configs/ubw32/src/up_usbdev.c
+++ b/configs/ubw32/src/pic32_usbdev.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/ubw32/src/up_usbdev.c
- * arch/arm/src/board/up_usbdev.c
+ * configs/ubw32/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
  ************************************************************************************/
 
 /************************************************************************************
diff --git a/configs/ubw32/src/up_usbterm.c b/configs/ubw32/src/pic32_usbterm.c
similarity index 97%
rename from configs/ubw32/src/up_usbterm.c
rename to configs/ubw32/src/pic32_usbterm.c
index 9fe84b548b..6279f1ef62 100644
--- a/configs/ubw32/src/up_usbterm.c
+++ b/configs/ubw32/src/pic32_usbterm.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/ubw32/src/up_usbterm.c
- * arch/arm/src/board/up_usbterm.c
+ * configs/ubw32/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/ubw32/src/ubw32-internal.h b/configs/ubw32/src/ubw32-internal.h
index ab1710ea52..98aea036c6 100644
--- a/configs/ubw32/src/ubw32-internal.h
+++ b/configs/ubw32/src/ubw32-internal.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/