diff --git a/configs/nucleus2g/src/Makefile b/configs/nucleus2g/src/Makefile
index 38df25bb586..023e391a81d 100644
--- a/configs/nucleus2g/src/Makefile
+++ b/configs/nucleus2g/src/Makefile
@@ -35,30 +35,30 @@
 
 -include $(TOPDIR)/Make.defs
 
-CFLAGS		+= -I$(TOPDIR)/sched
+CFLAGS += -I$(TOPDIR)/sched
 
-ASRCS		=
-CSRCS		= up_boot.c up_leds.c up_ssp.c up_outputs.c
+ASRCS =
+CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c lpc17_outputs.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
 
-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/nucleus2g/src/up_boot.c b/configs/nucleus2g/src/lpc17_boot.c
similarity index 99%
rename from configs/nucleus2g/src/up_boot.c
rename to configs/nucleus2g/src/lpc17_boot.c
index 83c6841649a..2d2bc805414 100644
--- a/configs/nucleus2g/src/up_boot.c
+++ b/configs/nucleus2g/src/lpc17_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/nucleus2g/src/up_boot.c
+ * configs/nucleus2g/src/lpc17_boot.c
  *
  *   Copyright (C) 2010, 2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/nucleus2g/src/up_leds.c b/configs/nucleus2g/src/lpc17_leds.c
similarity index 99%
rename from configs/nucleus2g/src/up_leds.c
rename to configs/nucleus2g/src/lpc17_leds.c
index 82d16d4ba58..6115f94b348 100644
--- a/configs/nucleus2g/src/up_leds.c
+++ b/configs/nucleus2g/src/lpc17_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/nucleus2g/src/up_leds.c
+ * configs/nucleus2g/src/lpc17_leds.c
  *
  *   Copyright (C) 2010, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/nucleus2g/src/up_nsh.c b/configs/nucleus2g/src/lpc17_nsh.c
similarity index 98%
rename from configs/nucleus2g/src/up_nsh.c
rename to configs/nucleus2g/src/lpc17_nsh.c
index 7bfc89d3e97..63dc234af22 100644
--- a/configs/nucleus2g/src/up_nsh.c
+++ b/configs/nucleus2g/src/lpc17_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/nucleus2g/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/nucleus2g/src/lpc17_nsh.c
  *
  *   Copyright (C) 2010-2011, 2013 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/nucleus2g/src/up_outputs.c b/configs/nucleus2g/src/lpc17_outputs.c
similarity index 98%
rename from configs/nucleus2g/src/up_outputs.c
rename to configs/nucleus2g/src/lpc17_outputs.c
index bf0c53c1602..2a1bc30f032 100644
--- a/configs/nucleus2g/src/up_outputs.c
+++ b/configs/nucleus2g/src/lpc17_outputs.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/nucleus2g/src/up_outputs.c
- * arch/arm/src/board/up_outputs.c
+ * configs/nucleus2g/src/lpc17_outputs.c
  *
  *   Copyright (C) 2012 Hal Glenn. All rights reserved.
  *   Author: Hal Glenn <hglenn@2g-eng.com>
diff --git a/configs/nucleus2g/src/up_ssp.c b/configs/nucleus2g/src/lpc17_ssp.c
similarity index 98%
rename from configs/nucleus2g/src/up_ssp.c
rename to configs/nucleus2g/src/lpc17_ssp.c
index c3492614bdf..7ddabb79465 100644
--- a/configs/nucleus2g/src/up_ssp.c
+++ b/configs/nucleus2g/src/lpc17_ssp.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/nucleus2g/src/up_ssp.c
- * arch/arm/src/board/up_ssp.c
+ * configs/nucleus2g/src/lpc17_ssp.c
  *
  *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -56,7 +55,7 @@
 #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* Enables debug output from this file (needs CONFIG_DEBUG too) */
diff --git a/configs/nucleus2g/src/up_usbmsc.c b/configs/nucleus2g/src/lpc17_usbmsc.c
similarity index 98%
rename from configs/nucleus2g/src/up_usbmsc.c
rename to configs/nucleus2g/src/lpc17_usbmsc.c
index 7fc4a124203..baa71437430 100644
--- a/configs/nucleus2g/src/up_usbmsc.c
+++ b/configs/nucleus2g/src/lpc17_usbmsc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/nucleus2g/src/up_usbmsc.c
+ * configs/nucleus2g/src/lpc17_usbmsc.c
  *
  *   Copyright (C) 2010, 2013 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 ************************************************************/
diff --git a/configs/nucleus2g/src/nucleus2g_internal.h b/configs/nucleus2g/src/nucleus2g_internal.h
index b6b0e983f63..933c0d575a1 100644
--- a/configs/nucleus2g/src/nucleus2g_internal.h
+++ b/configs/nucleus2g/src/nucleus2g_internal.h
@@ -1,6 +1,5 @@
 /************************************************************************************
  * configs/nucleus2g/src/nucleus2g_internal.h
- * arch/arm/src/board/nucleus2g_internal.n
  *
  *   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +44,7 @@
 #include <nuttx/compiler.h>
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* NUCLEUS-2G GPIO Pin Definitions **************************************************/