diff --git a/configs/amber/src/Makefile b/configs/amber/src/Makefile
index 4c38990ebd..abd76a6589 100644
--- a/configs/amber/src/Makefile
+++ b/configs/amber/src/Makefile
@@ -35,37 +35,37 @@
 
 -include $(TOPDIR)/Make.defs
 
-ASRCS		=
-CSRCS		= up_boot.c
+ASRCS =
+CSRCS = atmega_boot.c
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
-CSRCS		+= up_leds.c
+CSRCS += atmega_leds.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/amber/src/amber_internal.h b/configs/amber/src/amber_internal.h
index 6e847bdec9..167c06c585 100644
--- a/configs/amber/src/amber_internal.h
+++ b/configs/amber/src/amber_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" {
  ************************************************************************************/
 
 #if defined(CONFIG_AVR_SPI1) || defined(CONFIG_AVR_SPI2)
-EXTERN void weak_function atmega_spiinitialize(void);
+void weak_function atmega_spiinitialize(void);
 #endif
 
 /************************************************************************************
@@ -89,7 +90,7 @@ EXTERN void weak_function atmega_spiinitialize(void);
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_LEDS
-EXTERN void atmega_ledinit(void);
+void atmega_ledinit(void);
 #endif
 
 #undef EXTERN
diff --git a/configs/amber/src/up_boot.c b/configs/amber/src/atmega_boot.c
similarity index 99%
rename from configs/amber/src/up_boot.c
rename to configs/amber/src/atmega_boot.c
index b0b5656e8b..d568340a4e 100644
--- a/configs/amber/src/up_boot.c
+++ b/configs/amber/src/atmega_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/amber/src/up_boot.c
+ * configs/amber/src/atmega_boot.c
  *
  *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>