diff --git a/configs/ea3131/src/Makefile b/configs/ea3131/src/Makefile
index e87b42f3d1..13160b908f 100644
--- a/configs/ea3131/src/Makefile
+++ b/configs/ea3131/src/Makefile
@@ -40,38 +40,38 @@ CFLAGS += -I$(TOPDIR)/sched
 ASRCS =
 AOBJS = $(ASRCS:.S=$(OBJEXT))
 
-CSRCS = up_boot.c up_clkinit.c
+CSRCS = lpc31_boot.c lpc31_clkinit.c
 
 ifeq ($(CONFIG_ARCH_BUTTONS),y)
-CSRCS += up_buttons.c
+CSRCS += lpc31_buttons.c
 endif
 
 ifeq ($(CONFIG_LPC31_EXTDRAM),y)
-CSRCS += up_mem.c
+CSRCS += lpc31_mem.c
 endif
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
-CSRCS += up_leds.c
+CSRCS += lpc31_leds.c
 endif
 
 ifeq ($(CONFIG_LPC31_SPI),y)
-CSRCS += up_spi.c
+CSRCS += lpc31_spi.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += up_nsh.c
+CSRCS += lpc31_nsh.c
 endif
 
 ifeq ($(CONFIG_PAGING),y)
-CSRCS += up_fillpage.c
+CSRCS += lpc31_fillpage.c
 endif
 
 ifeq ($(CONFIG_LPC31_USBOTG),y)
 ifeq ($(CONFIG_USBHOST),y)
-CSRCS += up_usbhost.c
+CSRCS += lpc31_usbhost.c
 endif
 ifeq ($(CONFIG_USBMSC),y)
-CSRCS += up_usbmsc.c
+CSRCS += lpc31_usbmsc.c
 endif
 endif
 
diff --git a/configs/ea3131/src/ea3131_internal.h b/configs/ea3131/src/ea3131_internal.h
index c7a4093b48..6396a5a639 100644
--- a/configs/ea3131/src/ea3131_internal.h
+++ b/configs/ea3131/src/ea3131_internal.h
@@ -1,6 +1,5 @@
 /************************************************************************************
  * configs/ea3131/src/ea3131_internal.h
- * arch/arm/src/board/ea3131_internal.n
  *
  *   Copyright (C) 2009-2010,2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +47,7 @@
 #include "lpc31_ioconfig.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* EA3131L GPIOs ********************************************************************/
@@ -153,4 +152,3 @@ void weak_function lpc31_pginitialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_EA3131_SRC_EA3131_INTERNAL_H */
-
diff --git a/configs/ea3131/src/up_boot.c b/configs/ea3131/src/lpc31_boot.c
similarity index 99%
rename from configs/ea3131/src/up_boot.c
rename to configs/ea3131/src/lpc31_boot.c
index 4d23e5bb6e..1a6ad6e174 100644
--- a/configs/ea3131/src/up_boot.c
+++ b/configs/ea3131/src/lpc31_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/ea3131/src/up_boot.c
+ * configs/ea3131/src/lpc31_boot.c
  *
  *   Copyright (C) 2009, 2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ea3131/src/up_buttons.c b/configs/ea3131/src/lpc31_buttons.c
similarity index 98%
rename from configs/ea3131/src/up_buttons.c
rename to configs/ea3131/src/lpc31_buttons.c
index 1f0e107cb9..ec97286549 100644
--- a/configs/ea3131/src/up_buttons.c
+++ b/configs/ea3131/src/lpc31_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/ea3131/src/up_leds.c
+ * configs/ea3131/src/lpc31_buttons.c
  *
  *   Copyright (C) 2009-2010, 2014-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ea3131/src/up_clkinit.c b/configs/ea3131/src/lpc31_clkinit.c
similarity index 99%
rename from configs/ea3131/src/up_clkinit.c
rename to configs/ea3131/src/lpc31_clkinit.c
index b5c63f693f..601cb72ab6 100644
--- a/configs/ea3131/src/up_clkinit.c
+++ b/configs/ea3131/src/lpc31_clkinit.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/ea3131/src/up_clkinit.c
- * arch/arm/src/board/up_clkinit.c
+ * configs/ea3131/src/lpc31_clkinit.c
  *
  *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +47,7 @@
 #include "lpc31_cgudrvr.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Sub-domain Clock Bitsets *************************************************/
diff --git a/configs/ea3131/src/up_fillpage.c b/configs/ea3131/src/lpc31_fillpage.c
similarity index 99%
rename from configs/ea3131/src/up_fillpage.c
rename to configs/ea3131/src/lpc31_fillpage.c
index 34ed12c5ca..fc2157ee94 100644
--- a/configs/ea3131/src/up_fillpage.c
+++ b/configs/ea3131/src/lpc31_fillpage.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/ea3131/src/up_fillpage.c
- * arch/arm/src/board/up_fillpage.c
+ * configs/ea3131/src/lpc31_fillpage.c
  *
  *   Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -70,7 +69,7 @@
 #endif
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/
diff --git a/configs/ea3131/src/up_leds.c b/configs/ea3131/src/lpc31_leds.c
similarity index 99%
rename from configs/ea3131/src/up_leds.c
rename to configs/ea3131/src/lpc31_leds.c
index 764951dad9..08f7d4530d 100644
--- a/configs/ea3131/src/up_leds.c
+++ b/configs/ea3131/src/lpc31_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/ea3131/src/up_leds.c
+ * configs/ea3131/src/lpc31_leds.c
  *
  *   Copyright (C) 2009-2010, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ea3131/src/up_mem.c b/configs/ea3131/src/lpc31_mem.c
similarity index 99%
rename from configs/ea3131/src/up_mem.c
rename to configs/ea3131/src/lpc31_mem.c
index 1426fe91c5..abae4e92ce 100644
--- a/configs/ea3131/src/up_mem.c
+++ b/configs/ea3131/src/lpc31_mem.c
@@ -1,6 +1,6 @@
 /****************************************************************************
- * configs/ea3131/src/up_mem.c
- * arch/arm/src/board/up_mem.c
+ * configs/ea3131/src/lpc31_mem.c
+ * arch/arm/src/board/lpc31_mem.c
  *
  *   Copyright (C) 2009-2010,2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ea3131/src/up_nsh.c b/configs/ea3131/src/lpc31_nsh.c
similarity index 98%
rename from configs/ea3131/src/up_nsh.c
rename to configs/ea3131/src/lpc31_nsh.c
index 41bdfccb93..534bd106a9 100644
--- a/configs/ea3131/src/up_nsh.c
+++ b/configs/ea3131/src/lpc31_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/ea3131/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/ea3131/src/lpc31_nsh.c
  *
  *   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -53,7 +52,7 @@
 #include "lpc31_internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/
diff --git a/configs/ea3131/src/up_spi.c b/configs/ea3131/src/lpc31_spi.c
similarity index 98%
rename from configs/ea3131/src/up_spi.c
rename to configs/ea3131/src/lpc31_spi.c
index dbf57f7e48..90afd59545 100644
--- a/configs/ea3131/src/up_spi.c
+++ b/configs/ea3131/src/lpc31_spi.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/ea3131/src/up_spi.c
- * arch/arm/src/board/up_spi.c
+ * configs/ea3131/src/lpc31_spi.c
  *
  *   Copyright (C) 2009-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -139,4 +138,3 @@ uint8_t lpc31_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
 #endif /* 0 */
 #endif /* CONFIG_LPC31_SPI  */
-
diff --git a/configs/ea3131/src/up_usbhost.c b/configs/ea3131/src/lpc31_usbhost.c
similarity index 99%
rename from configs/ea3131/src/up_usbhost.c
rename to configs/ea3131/src/lpc31_usbhost.c
index 5e3b8450b6..b589434636 100644
--- a/configs/ea3131/src/up_usbhost.c
+++ b/configs/ea3131/src/lpc31_usbhost.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/ea3131/src/up_usbhost.c
+ * configs/ea3131/src/lpc31_usbhost.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ea3131/src/up_usbmsc.c b/configs/ea3131/src/lpc31_usbmsc.c
similarity index 98%
rename from configs/ea3131/src/up_usbmsc.c
rename to configs/ea3131/src/lpc31_usbmsc.c
index ec74fa4922..b6dd6648fa 100644
--- a/configs/ea3131/src/up_usbmsc.c
+++ b/configs/ea3131/src/lpc31_usbmsc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/ea3131/src/up_usbmsc.c
+ * configs/ea3131/src/lpc31_usbmsc.c
  *
  *   Copyright (C) 2010, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +52,7 @@
 #include <nuttx/fs/ramdisk.h>
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/