diff --git a/configs/lm3s8962-ek/src/Makefile b/configs/lm3s8962-ek/src/Makefile
index 9181f103ef..ceceb0daa1 100644
--- a/configs/lm3s8962-ek/src/Makefile
+++ b/configs/lm3s8962-ek/src/Makefile
@@ -35,30 +35,30 @@
 
 -include $(TOPDIR)/Make.defs
 
-CFLAGS		+= -I$(TOPDIR)/sched
+CFLAGS += -I$(TOPDIR)/sched
 
-ASRCS		=
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-CSRCS		= up_boot.c up_leds.c up_ethernet.c up_ssi.c
+ASRCS =
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += lm_nsh.c
 endif
 ifeq ($(CONFIG_NX_LCDDRIVER),y)
-CSRCS		+= up_oled.c
+CSRCS += lm_oled.c
 endif
 
-COBJS		= $(CSRCS:.c=$(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/lm3s8962-ek/src/lm3s8962ek_internal.h b/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
index f6148f0712..37f385b3a5 100644
--- a/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
+++ b/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
@@ -1,6 +1,5 @@
 /************************************************************************************
  * configs/lm3s8962-ek/src/lm3s8962ek_internal.h
- * arch/arm/src/board/lm3s8962ek_internal.n
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +47,7 @@
 #include "tiva_gpio.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* How many SSI modules does this chip support? The LM3S8962 supports 1 SSI
diff --git a/configs/lm3s8962-ek/src/up_boot.c b/configs/lm3s8962-ek/src/lm_boot.c
similarity index 99%
rename from configs/lm3s8962-ek/src/up_boot.c
rename to configs/lm3s8962-ek/src/lm_boot.c
index 5119a82ddf..4926311c4e 100644
--- a/configs/lm3s8962-ek/src/up_boot.c
+++ b/configs/lm3s8962-ek/src/lm_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/lm3s8962-ek/src/up_boot.c
+ * configs/lm3s8962-ek/src/lm_boot.c
  *
  *   Copyright (C) 2010, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/lm3s8962-ek/src/up_ethernet.c b/configs/lm3s8962-ek/src/lm_ethernet.c
similarity index 98%
rename from configs/lm3s8962-ek/src/up_ethernet.c
rename to configs/lm3s8962-ek/src/lm_ethernet.c
index 6202313305..fb5db9e152 100644
--- a/configs/lm3s8962-ek/src/up_ethernet.c
+++ b/configs/lm3s8962-ek/src/lm_ethernet.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/lm3s8962-ek/src/up_ethernet.c
- * arch/arm/src/board/up_ethernet.c
+ * configs/lm3s8962-ek/src/lm_ethernet.c
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/lm3s8962-ek/src/up_leds.c b/configs/lm3s8962-ek/src/lm_leds.c
similarity index 98%
rename from configs/lm3s8962-ek/src/up_leds.c
rename to configs/lm3s8962-ek/src/lm_leds.c
index a2945664a1..00bd67429a 100644
--- a/configs/lm3s8962-ek/src/up_leds.c
+++ b/configs/lm3s8962-ek/src/lm_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/lm3s8962-ek/src/up_leds.c
+ * configs/lm3s8962-ek/src/lm_leds.c
  *
  *   Copyright (C) 2010, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +52,7 @@
 #include "lm3s8962ek_internal.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
diff --git a/configs/lm3s8962-ek/src/up_nsh.c b/configs/lm3s8962-ek/src/lm_nsh.c
similarity index 98%
rename from configs/lm3s8962-ek/src/up_nsh.c
rename to configs/lm3s8962-ek/src/lm_nsh.c
index 9063dee4dd..6c4938f706 100644
--- a/configs/lm3s8962-ek/src/up_nsh.c
+++ b/configs/lm3s8962-ek/src/lm_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/lm3s8962-ek/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/lm3s8962-ek/src/lm_nsh.c
  *
  *   Copyright (C) 2010 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/lm3s8962-ek/src/up_oled.c b/configs/lm3s8962-ek/src/lm_oled.c
similarity index 98%
rename from configs/lm3s8962-ek/src/up_oled.c
rename to configs/lm3s8962-ek/src/lm_oled.c
index baf258d2a7..cc641adcb3 100644
--- a/configs/lm3s8962-ek/src/up_oled.c
+++ b/configs/lm3s8962-ek/src/lm_oled.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/lm3s8962-ek/src/up_oled.c
- * arch/arm/src/board/up_oled.c
+ * config/lm3s8962-ek/src/lm_oled.c
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +51,7 @@
 #include "lm3s8962ek_internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Define the CONFIG_LCD_RITDEBUG to enable detailed debug output (stuff you
diff --git a/configs/lm3s8962-ek/src/up_ssi.c b/configs/lm3s8962-ek/src/lm_ssi.c
similarity index 98%
rename from configs/lm3s8962-ek/src/up_ssi.c
rename to configs/lm3s8962-ek/src/lm_ssi.c
index 762de87ea8..76cd43b3fa 100644
--- a/configs/lm3s8962-ek/src/up_ssi.c
+++ b/configs/lm3s8962-ek/src/lm_ssi.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/lm3s8962-ek/src/up_ssi.c
- * arch/arm/src/board/up_ssi.c
+ * configs/lm3s8962-ek/src/lm_ssi.c
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -57,7 +56,7 @@
 #if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* Enables debug output from this file (needs CONFIG_DEBUG too) */