diff --git a/configs/mirtoo/src/Makefile b/configs/mirtoo/src/Makefile
index 0306c9a41ba..bdd72ec53f1 100644
--- a/configs/mirtoo/src/Makefile
+++ b/configs/mirtoo/src/Makefile
@@ -35,36 +35,36 @@
 
 -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_PIC32MX_SPI2),y)
-CSRCS		+= up_spi2.c
+CSRCS += pic32_spi2.c
 endif
 
 ifeq ($(CONFIG_PIC32MX_ADC),y)
-CSRCS		+= up_adc.c
+CSRCS += pic32_adc.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += pic32_nsh.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/mirtoo/src/mirtoo-internal.h b/configs/mirtoo/src/mirtoo-internal.h
index cbdbf2e1237..66d96f1f5dc 100644
--- a/configs/mirtoo/src/mirtoo-internal.h
+++ b/configs/mirtoo/src/mirtoo-internal.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
 
diff --git a/configs/mirtoo/src/up_adc.c b/configs/mirtoo/src/pic32_adc.c
similarity index 97%
rename from configs/mirtoo/src/up_adc.c
rename to configs/mirtoo/src/pic32_adc.c
index a35facbcec2..18bbfbb6aa0 100644
--- a/configs/mirtoo/src/up_adc.c
+++ b/configs/mirtoo/src/pic32_adc.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/mirtoo/src/up_adc.c
- * arch/arm/src/board/up_adc.c
+ * config/mirtoo/src/pic32_adc.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +49,7 @@
 #ifdef CONFIG_PIC32MX_ADC
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
 /* The Mirtoo features a PGA117 amplifier/multipexer that can be configured to
@@ -102,4 +101,4 @@ int pic32mx_adcinitialize(void)
 }
 #endif
 
-#endif /* CONFIG_PIC32MX_ADC */
\ No newline at end of file
+#endif /* CONFIG_PIC32MX_ADC */
diff --git a/configs/mirtoo/src/up_boot.c b/configs/mirtoo/src/pic32_boot.c
similarity index 98%
rename from configs/mirtoo/src/up_boot.c
rename to configs/mirtoo/src/pic32_boot.c
index 46dbd8127fb..7d3f8ca34eb 100644
--- a/configs/mirtoo/src/up_boot.c
+++ b/configs/mirtoo/src/pic32_boot.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/mirtoo/src/up_boot.c
- * arch/mips/src/board/up_boot.c
+ * configs/mirtoo/src/pic32_boot.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +51,7 @@
 #include "mirtoo-internal.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 #define GPIO_U1TX  (GPIO_OUTPUT|GPIO_PORTC|GPIO_PIN5)
diff --git a/configs/mirtoo/src/up_leds.c b/configs/mirtoo/src/pic32_leds.c
similarity index 99%
rename from configs/mirtoo/src/up_leds.c
rename to configs/mirtoo/src/pic32_leds.c
index d466cb3525e..b362c1afadb 100644
--- a/configs/mirtoo/src/up_leds.c
+++ b/configs/mirtoo/src/pic32_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/mirtoo/src/up_leds.c
+ * configs/mirtoo/src/pic32_leds.c
  *
  *   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/mirtoo/src/up_nsh.c b/configs/mirtoo/src/pic32_nsh.c
similarity index 98%
rename from configs/mirtoo/src/up_nsh.c
rename to configs/mirtoo/src/pic32_nsh.c
index 9aa1f9aa9ee..677f54fc02e 100644
--- a/configs/mirtoo/src/up_nsh.c
+++ b/configs/mirtoo/src/pic32_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/mirtoo/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/mirtoo/src/pic32_nsh.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -56,7 +55,7 @@
 #include "pic32mx-internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/
diff --git a/configs/mirtoo/src/up_spi2.c b/configs/mirtoo/src/pic32_spi2.c
similarity index 98%
rename from configs/mirtoo/src/up_spi2.c
rename to configs/mirtoo/src/pic32_spi2.c
index f6fcada5cea..aff3a0ae36c 100644
--- a/configs/mirtoo/src/up_spi2.c
+++ b/configs/mirtoo/src/pic32_spi2.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/mirtoo/src/up_spi2.c
- * arch/arm/src/board/up_spi2.c
+ * configs/mirtoo/src/pic32_spi2.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -56,7 +55,7 @@
 #ifdef CONFIG_PIC32MX_SPI2
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* The Mirtoo module as two on-board SPI devices: