diff --git a/configs/twr-k60n512/src/Makefile b/configs/twr-k60n512/src/Makefile
index 5bb3e0fc22b..c94e462444b 100644
--- a/configs/twr-k60n512/src/Makefile
+++ b/configs/twr-k60n512/src/Makefile
@@ -35,45 +35,45 @@
 
 -include $(TOPDIR)/Make.defs
 
-CFLAGS		+= -I$(TOPDIR)/sched
+CFLAGS += -I$(TOPDIR)/sched
 
-ASRCS		=
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
+ASRCS =
+AOBJS = $(ASRCS:.S=$(OBJEXT))
 
-CSRCS		= up_boot.c up_spi.c
+CSRCS = k60_boot.c k60_spi.c
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
-CSRCS		+= up_leds.c
+CSRCS += k60_leds.c
 endif
 
 ifeq ($(CONFIG_ARCH_BUTTONS),y)
-CSRCS		+= up_buttons.c
+CSRCS += k60_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += k60_nsh.c
 endif
 
 ifeq ($(CONFIG_USBDEV),y)
-CSRCS		+= up_usbdev.c
+CSRCS += k60_usbdev.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbmsc.c
+CSRCS += k60_usbmsc.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/twr-k60n512/src/up_boot.c b/configs/twr-k60n512/src/k60_boot.c
similarity index 99%
rename from configs/twr-k60n512/src/up_boot.c
rename to configs/twr-k60n512/src/k60_boot.c
index 64f83cfc4e4..a93012d6429 100644
--- a/configs/twr-k60n512/src/up_boot.c
+++ b/configs/twr-k60n512/src/k60_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/twr-k60n512/src/up_boot.c
+ * configs/twr-k60n512/src/k60_boot.c
  *
  *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/twr-k60n512/src/up_buttons.c b/configs/twr-k60n512/src/k60_buttons.c
similarity index 99%
rename from configs/twr-k60n512/src/up_buttons.c
rename to configs/twr-k60n512/src/k60_buttons.c
index dabc17b0a51..37c0837df32 100644
--- a/configs/twr-k60n512/src/up_buttons.c
+++ b/configs/twr-k60n512/src/k60_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/twr-k60n512/src/board_buttons.c
+ * configs/twr-k60n512/src/k60_buttons.c
  *
  *   Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/twr-k60n512/src/up_leds.c b/configs/twr-k60n512/src/k60_leds.c
similarity index 99%
rename from configs/twr-k60n512/src/up_leds.c
rename to configs/twr-k60n512/src/k60_leds.c
index 8abbd190efc..9f880d63f61 100644
--- a/configs/twr-k60n512/src/up_leds.c
+++ b/configs/twr-k60n512/src/k60_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/twr-k60n512/src/up_leds.c
+ * configs/twr-k60n512/src/k60_leds.c
  *
  *   Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/twr-k60n512/src/up_nsh.c b/configs/twr-k60n512/src/k60_nsh.c
similarity index 98%
rename from configs/twr-k60n512/src/up_nsh.c
rename to configs/twr-k60n512/src/k60_nsh.c
index 7d3e35009da..91124b6277a 100644
--- a/configs/twr-k60n512/src/up_nsh.c
+++ b/configs/twr-k60n512/src/k60_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/twr-k60n512/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/twr-k60n512/src/k60_nsh.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -54,7 +53,7 @@
 #include "twrk60-internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
 
diff --git a/configs/twr-k60n512/src/up_spi.c b/configs/twr-k60n512/src/k60_spi.c
similarity index 98%
rename from configs/twr-k60n512/src/up_spi.c
rename to configs/twr-k60n512/src/k60_spi.c
index afdc48f00d8..da779aa56b6 100644
--- a/configs/twr-k60n512/src/up_spi.c
+++ b/configs/twr-k60n512/src/k60_spi.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/twr-k60n512/src/up_spi.c
- * arch/arm/src/board/up_spi.c
+ * configs/twr-k60n512/src/k60_spi.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -55,7 +54,7 @@
 #if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* Enables debug output from this file (needs CONFIG_DEBUG too) */
diff --git a/configs/twr-k60n512/src/up_usbdev.c b/configs/twr-k60n512/src/k60_usbdev.c
similarity index 98%
rename from configs/twr-k60n512/src/up_usbdev.c
rename to configs/twr-k60n512/src/k60_usbdev.c
index 8a07e8f8744..ae16d1d2280 100644
--- a/configs/twr-k60n512/src/up_usbdev.c
+++ b/configs/twr-k60n512/src/k60_usbdev.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/twr-k60n512/src/up_usbdev.c
- * arch/arm/src/board/up_boot.c
+ * configs/twr-k60n512/src/k60_usbdev.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -53,7 +52,7 @@
 #include "twrk60-internal.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
diff --git a/configs/twr-k60n512/src/up_usbmsc.c b/configs/twr-k60n512/src/k60_usbmsc.c
similarity index 98%
rename from configs/twr-k60n512/src/up_usbmsc.c
rename to configs/twr-k60n512/src/k60_usbmsc.c
index 8d67c08bd0c..f5421b8fa19 100644
--- a/configs/twr-k60n512/src/up_usbmsc.c
+++ b/configs/twr-k60n512/src/k60_usbmsc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/twr-k60n512/src/up_usbmsc.c
+ * configs/twr-k60n512/src/k60_usbmsc.c
  *
  *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +51,7 @@
 #include "kinetis_internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/
diff --git a/configs/twr-k60n512/src/twrk60-internal.h b/configs/twr-k60n512/src/twrk60-internal.h
index b87468a3f16..006682bbcf6 100644
--- a/configs/twr-k60n512/src/twrk60-internal.h
+++ b/configs/twr-k60n512/src/twrk60-internal.h
@@ -1,6 +1,5 @@
 /************************************************************************************
  * configs/twr-k60n512/src/twrk60-internal.h
- * arch/arm/src/board/twrk60-internal.h
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -46,7 +45,7 @@
 #include <stdint.h>
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* How many SPI modules does this chip support? The LM3S6918 supports 2 SPI
@@ -280,7 +279,7 @@
  *
  ************************************************************************************/
 
-extern void weak_function kinetis_spiinitialize(void);
+void weak_function kinetis_spiinitialize(void);
 
 /************************************************************************************
  * Name: kinetis_usbinitialize
@@ -290,8 +289,7 @@ extern void weak_function kinetis_spiinitialize(void);
  *
  ************************************************************************************/
 
-extern void weak_function kinetis_usbinitialize(void);
+void weak_function kinetis_usbinitialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_TWR_K60N512_SRC_TWRK60_INTERNAL_H */
-