diff --git a/configs/teensy/src/Makefile b/configs/teensy/src/Makefile
index 329ab01204..df52808ecd 100644
--- a/configs/teensy/src/Makefile
+++ b/configs/teensy/src/Makefile
@@ -35,43 +35,43 @@
 
 -include $(TOPDIR)/Make.defs
 
-ASRCS		=
-CSRCS		= up_boot.c
+ASRCS =
+CSRCS = at90usb_boot.c
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
-CSRCS		+= up_leds.c
+CSRCS += at90usb_leds.c
 endif
 ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbmsc.c
+CSRCS += at90usb_usbmsc.c
 endif
 ifeq ($(CONFIG_AVR_SPI),y)
-CSRCS		+= up_spi.c
+CSRCS += at90usb_spi.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 ($(CONFIG_ARCH_FAMILY_AVR32),y)
-ARCH_SUBDIR	= avr32
+ARCH_SUBDIR = avr32
 endif
 ifeq ($(CONFIG_ARCH_FAMILY_AVR),y)
-ARCH_SUBDIR	= avr
+ARCH_SUBDIR = avr
 endif
 
 ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(TOPDIR)/sched}"
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}"
+  CFLAGS += -I "${shell cygpath -w $(TOPDIR)/sched}"
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}"
 else
-  CFLAGS	+= -I "$(TOPDIR)/sched"
-  CFLAGS	+= -I "$(ARCH_SRCDIR)/chip"
-  CFLAGS	+= -I "$(ARCH_SRCDIR)/common"
-  CFLAGS	+= -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)"
+  CFLAGS += -I "$(TOPDIR)/sched"
+  CFLAGS += -I "$(ARCH_SRCDIR)/chip"
+  CFLAGS += -I "$(ARCH_SRCDIR)/common"
+  CFLAGS += -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)"
 endif
 
 all: libboard$(LIBEXT)
diff --git a/configs/teensy/src/up_boot.c b/configs/teensy/src/at90usb_boot.c
similarity index 98%
rename from configs/teensy/src/up_boot.c
rename to configs/teensy/src/at90usb_boot.c
index 8764949c99..0495ddea64 100644
--- a/configs/teensy/src/up_boot.c
+++ b/configs/teensy/src/at90usb_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/teensy/src/up_boot.c
+ * configs/teensy/src/at90usb_boot.c
  *
  *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include "teensy_internal.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
diff --git a/configs/teensy/src/up_leds.c b/configs/teensy/src/at90usb_leds.c
similarity index 99%
rename from configs/teensy/src/up_leds.c
rename to configs/teensy/src/at90usb_leds.c
index c813893956..5d3762e35c 100644
--- a/configs/teensy/src/up_leds.c
+++ b/configs/teensy/src/at90usb_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/teensy/src/up_leds.c
+ * configs/teensy/src/at90usb_leds.c
  *
  *   Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/teensy/src/up_spi.c b/configs/teensy/src/at90usb_spi.c
similarity index 98%
rename from configs/teensy/src/up_spi.c
rename to configs/teensy/src/at90usb_spi.c
index 57a94c1abe..f3cc85ed8f 100644
--- a/configs/teensy/src/up_spi.c
+++ b/configs/teensy/src/at90usb_spi.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/teensy/src/up_spi.c
- * arch/arm/src/board/up_spi.c
+ * configs/teensy/src/at90usb_spi.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -56,7 +55,7 @@
 #ifdef CONFIG_AVR_SPI
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /* Teensy SPI Connection
  *
diff --git a/configs/teensy/src/up_usbmsc.c b/configs/teensy/src/at90usb_usbmsc.c
similarity index 97%
rename from configs/teensy/src/up_usbmsc.c
rename to configs/teensy/src/at90usb_usbmsc.c
index c467d4324d..47acbfd2e1 100644
--- a/configs/teensy/src/up_usbmsc.c
+++ b/configs/teensy/src/at90usb_usbmsc.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/teensy/src/up_usbmsc.c
- * arch/arm/src/board/up_usbmsc.c
+ * configs/teensy/src/at90usb_usbmsc.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -53,7 +52,7 @@
 #include "teensy_internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/
diff --git a/configs/teensy/src/teensy_internal.h b/configs/teensy/src/teensy_internal.h
index f253b590f8..bbe6a3aad9 100644
--- a/configs/teensy/src/teensy_internal.h
+++ b/configs/teensy/src/teensy_internal.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
 
@@ -63,7 +63,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
@@ -77,7 +78,7 @@ extern "C" {
  ************************************************************************************/
 
 #ifdef CONFIG_AVR_SPI
-EXTERN void weak_function at90usb_spiinitialize(void);
+void weak_function at90usb_spiinitialize(void);
 #endif
 
 /************************************************************************************
@@ -89,7 +90,7 @@ EXTERN void weak_function at90usb_spiinitialize(void);
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_LEDS
-EXTERN void at90usb_ledinit(void);
+void at90usb_ledinit(void);
 #endif
 
 #undef EXTERN