diff --git a/configs/ekk-lm3s9b96/src/Makefile b/configs/ekk-lm3s9b96/src/Makefile
index ee8356fb52d..c6af87d900c 100644
--- a/configs/ekk-lm3s9b96/src/Makefile
+++ b/configs/ekk-lm3s9b96/src/Makefile
@@ -36,27 +36,27 @@
 
 -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
 
-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/ekk-lm3s9b96/src/ekklm3s9b96_internal.h b/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
index 2c5047f8703..4b98ef5b1ea 100644
--- a/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
+++ b/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
@@ -1,6 +1,5 @@
 /************************************************************************************
  * configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
- * arch/arm/src/board/lm3s6965ek_internal.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -49,7 +48,7 @@
 #include "tiva_gpio.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* How many SSI modules does this chip support? The LM3S9B96 supports 2 SSI
diff --git a/configs/ekk-lm3s9b96/src/up_boot.c b/configs/ekk-lm3s9b96/src/lm_boot.c
similarity index 98%
rename from configs/ekk-lm3s9b96/src/up_boot.c
rename to configs/ekk-lm3s9b96/src/lm_boot.c
index 426b7efafd9..3a8674b83dc 100644
--- a/configs/ekk-lm3s9b96/src/up_boot.c
+++ b/configs/ekk-lm3s9b96/src/lm_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/ekk-lm3s9b96/src/up_boot.c
+ * configs/ekk-lm3s9b96/src/lm_boot.c
  *
  *   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ekk-lm3s9b96/src/up_ethernet.c b/configs/ekk-lm3s9b96/src/lm_ethernet.c
similarity index 98%
rename from configs/ekk-lm3s9b96/src/up_ethernet.c
rename to configs/ekk-lm3s9b96/src/lm_ethernet.c
index 26e3630a12a..622a972b3ea 100644
--- a/configs/ekk-lm3s9b96/src/up_ethernet.c
+++ b/configs/ekk-lm3s9b96/src/lm_ethernet.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/lm3s6965-ek/src/up_ethernet.c
- * arch/arm/src/board/up_ethernet.c
+ * configs/lm3s6965-ek/src/lm_ethernet.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ekk-lm3s9b96/src/up_leds.c b/configs/ekk-lm3s9b96/src/lm_leds.c
similarity index 99%
rename from configs/ekk-lm3s9b96/src/up_leds.c
rename to configs/ekk-lm3s9b96/src/lm_leds.c
index f91eabc41f3..109b0b96e10 100644
--- a/configs/ekk-lm3s9b96/src/up_leds.c
+++ b/configs/ekk-lm3s9b96/src/lm_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/lm3s6965-ek/src/up_leds.c
+ * configs/lm3s6965-ek/src/lm_leds.c
  *
  *   Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ekk-lm3s9b96/src/up_nsh.c b/configs/ekk-lm3s9b96/src/lm_nsh.c
similarity index 96%
rename from configs/ekk-lm3s9b96/src/up_nsh.c
rename to configs/ekk-lm3s9b96/src/lm_nsh.c
index 611261a618c..9f04e3efbf6 100644
--- a/configs/ekk-lm3s9b96/src/up_nsh.c
+++ b/configs/ekk-lm3s9b96/src/lm_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/ekk-lm3s9b96/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/ekk-lm3s9b96/src/lm_nsh.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -46,7 +45,7 @@
 #include <errno.h>
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/configs/ekk-lm3s9b96/src/up_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c
similarity index 98%
rename from configs/ekk-lm3s9b96/src/up_ssi.c
rename to configs/ekk-lm3s9b96/src/lm_ssi.c
index fa603df2e5b..d319d525213 100644
--- a/configs/ekk-lm3s9b96/src/up_ssi.c
+++ b/configs/ekk-lm3s9b96/src/lm_ssi.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/ekk-lm3s9b96/src/up_ssi.c
- * arch/arm/src/board/up_ssi.c
+ * configs/ekk-lm3s9b96/src/lm_ssi.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -56,7 +55,7 @@
 #if defined(CONFIG_TIVA_SSI0)  || defined(CONFIG_TIVA_SSI1)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* Enables debug output from this file (needs CONFIG_DEBUG too) */