diff --git a/configs/lincoln60/src/Makefile b/configs/lincoln60/src/Makefile
index 1fc01490a2..a54083f1e5 100644
--- a/configs/lincoln60/src/Makefile
+++ b/configs/lincoln60/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 = lpc17_boot.c lpc17_leds.c
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += lpc17_nsh.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbmsc.c
+CSRCS += lpc17_usbmsc.c
 endif
 
 ifeq ($(CONFIG_ARCH_BUTTONS),y)
-CSRCS           += up_buttons.c
+CSRCS += lpc17_buttons.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)/armv7-m}"
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
 else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
+  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
 endif
 
 all: libboard$(LIBEXT)
diff --git a/configs/lincoln60/src/lincoln60_internal.h b/configs/lincoln60/src/lincoln60_internal.h
index 5f9891883f..6d84d571f0 100644
--- a/configs/lincoln60/src/lincoln60_internal.h
+++ b/configs/lincoln60/src/lincoln60_internal.h
@@ -1,6 +1,5 @@
 /****************************************************************************
  * configs/lincoln60/src/lincoln60_internal.h
- * arch/arm/src/board/lincoln60_internal.n
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +44,7 @@
 #include <nuttx/compiler.h>
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/configs/lincoln60/src/up_boot.c b/configs/lincoln60/src/lpc17_boot.c
similarity index 98%
rename from configs/lincoln60/src/up_boot.c
rename to configs/lincoln60/src/lpc17_boot.c
index c20295815f..bbaf0c1784 100644
--- a/configs/lincoln60/src/up_boot.c
+++ b/configs/lincoln60/src/lpc17_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/lincoln60/src/up_boot.c
+ * configs/lincoln60/src/lpc17_boot.c
  *
  *   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/lincoln60/src/up_buttons.c b/configs/lincoln60/src/lpc17_buttons.c
similarity index 99%
rename from configs/lincoln60/src/up_buttons.c
rename to configs/lincoln60/src/lpc17_buttons.c
index 610e2cab09..38a2326a52 100644
--- a/configs/lincoln60/src/up_buttons.c
+++ b/configs/lincoln60/src/lpc17_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/lincoln60/src/board_buttons.c
+ * configs/lincoln60/src/lpc17_buttons.c
  *
  *   Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/lincoln60/src/up_leds.c b/configs/lincoln60/src/lpc17_leds.c
similarity index 98%
rename from configs/lincoln60/src/up_leds.c
rename to configs/lincoln60/src/lpc17_leds.c
index d91cf407f7..47edb089e5 100644
--- a/configs/lincoln60/src/up_leds.c
+++ b/configs/lincoln60/src/lpc17_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/lincoln60/src/up_leds.c
+ * configs/lincoln60/src/lpc17_leds.c
  *
  *   Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -57,7 +57,7 @@
 #ifdef CONFIG_ARCH_LEDS
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
diff --git a/configs/lincoln60/src/up_nsh.c b/configs/lincoln60/src/lpc17_nsh.c
similarity index 96%
rename from configs/lincoln60/src/up_nsh.c
rename to configs/lincoln60/src/lpc17_nsh.c
index d54c140c33..041a3345a1 100644
--- a/configs/lincoln60/src/up_nsh.c
+++ b/configs/lincoln60/src/lpc17_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/lincoln60/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/lincoln60/src/lpc17_nsh.c
  *
  *   Copyright (C) 2012 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
  ****************************************************************************/
 
 /****************************************************************************