diff --git a/configs/mcu123-lpc214x/src/Makefile b/configs/mcu123-lpc214x/src/Makefile
index 57630674d36..dbbf6029329 100644
--- a/configs/mcu123-lpc214x/src/Makefile
+++ b/configs/mcu123-lpc214x/src/Makefile
@@ -35,38 +35,38 @@
 
 -include $(TOPDIR)/Make.defs
 
-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)/arm}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/sched}"
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/arm}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/sched}"
 else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm -I$(TOPDIR)/sched
+  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm -I$(TOPDIR)/sched
 endif
 
-ASRCS		=
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-CSRCS		= up_spi1.c up_leds.c
+ASRCS =
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+CSRCS = lpc2148_spi1.c lpc2148_leds.c
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += lpc2148_nsh.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbmsc.c
+CSRCS += lpc2148_usbmsc.c
 endif
 
 ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
-CSRCS		+= up_composite.c
+CSRCS += lpc2148_composite.c
 endif
 
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
-CFLAGS		+= -I $(TOPDIR)/arch/$(CONFIG_ARCH)/src
+CFLAGS += -I $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 
 all: libboard$(LIBEXT)
 
diff --git a/configs/mcu123-lpc214x/src/up_composite.c b/configs/mcu123-lpc214x/src/lpc2148_composite.c
similarity index 98%
rename from configs/mcu123-lpc214x/src/up_composite.c
rename to configs/mcu123-lpc214x/src/lpc2148_composite.c
index 754d66e285f..b6ea46f222c 100644
--- a/configs/mcu123-lpc214x/src/up_composite.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_composite.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/mcu123-lpc214x/src/up_composite.c
+ * configs/mcu123-lpc214x/src/lpc2148_composite.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include <nuttx/usb/composite.h>
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/
diff --git a/configs/mcu123-lpc214x/src/up_leds.c b/configs/mcu123-lpc214x/src/lpc2148_leds.c
similarity index 98%
rename from configs/mcu123-lpc214x/src/up_leds.c
rename to configs/mcu123-lpc214x/src/lpc2148_leds.c
index 40495e5216a..59c6e8c0e89 100644
--- a/configs/mcu123-lpc214x/src/up_leds.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/mcu123-lpc214x/src/up_leds.c
+ * configs/mcu123-lpc214x/src/lpc2148_leds.c
  *
  *   Copyright (C) 2007-2009, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/mcu123-lpc214x/src/up_nsh.c b/configs/mcu123-lpc214x/src/lpc2148_nsh.c
similarity index 98%
rename from configs/mcu123-lpc214x/src/up_nsh.c
rename to configs/mcu123-lpc214x/src/lpc2148_nsh.c
index 2496f38d7e0..37cfe5a32d2 100644
--- a/configs/mcu123-lpc214x/src/up_nsh.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/mcu123-lpc214x/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/mcu123-lpc214x/src/lpc2148_nsh.c
  *
  *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +47,7 @@
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/
diff --git a/configs/mcu123-lpc214x/src/up_spi1.c b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
similarity index 99%
rename from configs/mcu123-lpc214x/src/up_spi1.c
rename to configs/mcu123-lpc214x/src/lpc2148_spi1.c
index 0a19a048380..7d0c06f7c46 100644
--- a/configs/mcu123-lpc214x/src/up_spi1.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/mcu123-lpc214x/src/up_spi1.c
- * arch/arm/src/board/up_spi1.c
+ * config/mcu123-lpc214x/src/lpc2148_spi1.c
  *
  *   Copyright (C) 2008-2010, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -82,7 +81,7 @@
 #include "lpc214x_spi.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Enables debug output from this file */
diff --git a/configs/mcu123-lpc214x/src/up_usbmsc.c b/configs/mcu123-lpc214x/src/lpc2148_usbmsc.c
similarity index 98%
rename from configs/mcu123-lpc214x/src/up_usbmsc.c
rename to configs/mcu123-lpc214x/src/lpc2148_usbmsc.c
index 45182d0a6cc..bb0050d4023 100644
--- a/configs/mcu123-lpc214x/src/up_usbmsc.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_usbmsc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/mcu123-lpc214x/src/up_usbmsc.c
+ * configs/mcu123-lpc214x/src/lpc2148_usbmsc.c
  *
  *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,7 +49,7 @@
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/