diff --git a/configs/zp214xpa/src/Makefile b/configs/zp214xpa/src/Makefile
index d7fabbac49..00e20ce893 100644
--- a/configs/zp214xpa/src/Makefile
+++ b/configs/zp214xpa/src/Makefile
@@ -35,30 +35,30 @@
 
 -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		=
+ASRCS =
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+CSRCS =
 
 ifeq ($(CONFIG_LCD_UG2864AMBAG01),y)
-CSRCS += up_ug2864ambag01.c up_spi1.c
+CSRCS += lpc2148_ug2864ambag01.c lpc2148_spi1.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/zp214xpa/src/up_spi1.c b/configs/zp214xpa/src/lpc2148_spi1.c
similarity index 99%
rename from configs/zp214xpa/src/up_spi1.c
rename to configs/zp214xpa/src/lpc2148_spi1.c
index 6996109bcd..e3b2e4f324 100644
--- a/configs/zp214xpa/src/up_spi1.c
+++ b/configs/zp214xpa/src/lpc2148_spi1.c
@@ -1,6 +1,5 @@
 /****************************************************************************
  * config/zp214xpa/src/up_spi1.c
- * arch/arm/src/board/up_spi1.c
  *
  *   Copyright (C) 2008-2010, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -83,7 +82,7 @@
 #include "lpc214x_spi.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Enables debug output from this file */
diff --git a/configs/zp214xpa/src/up_ug2864ambag01.c b/configs/zp214xpa/src/lpc2148_ug2864ambag01.c
similarity index 98%
rename from configs/zp214xpa/src/up_ug2864ambag01.c
rename to configs/zp214xpa/src/lpc2148_ug2864ambag01.c
index b58877ca28..398fc2c510 100644
--- a/configs/zp214xpa/src/up_ug2864ambag01.c
+++ b/configs/zp214xpa/src/lpc2148_ug2864ambag01.c
@@ -1,6 +1,5 @@
 /****************************************************************************
  * config/zp214xpa/src/up_ug2864ambag01.c
- * arch/arm/src/board/up_ug2864ambag01.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -53,7 +52,7 @@
 #ifdef CONFIG_LCD_UG2864AMBAG01
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
 /* The pin configurations here requires that SPI1 is avaialable */