diff --git a/configs/arduino-mega2560/README.txt b/configs/arduino-mega2560/README.txt
index 96db47bf11..a1246ad9de 100644
--- a/configs/arduino-mega2560/README.txt
+++ b/configs/arduino-mega2560/README.txt
@@ -20,4 +20,3 @@ http://www.atmel.com/tools/atmelavrtoolchainforwindows.aspx
 It is basically WinAVR compatible so sub-projects may define WinAVR as a
 tool-chain but specify path to the Atmel AVR8 in path. See
 arduino-mega2560/hello for example.
-
diff --git a/configs/arduino-mega2560/include/board.h b/configs/arduino-mega2560/include/board.h
index 25499a5be2..6d6f122c9f 100644
--- a/configs/arduino-mega2560/include/board.h
+++ b/configs/arduino-mega2560/include/board.h
@@ -1,8 +1,7 @@
 /****************************************************************************
  * configs/arduino-mega2560/include/board.h
- * include/arch/board/board.h
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/configs/arduino-mega2560/src/Makefile b/configs/arduino-mega2560/src/Makefile
index 95aa205287..1f7743da6f 100644
--- a/configs/arduino-mega2560/src/Makefile
+++ b/configs/arduino-mega2560/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/arduino-mega2560/src/Makefile
 #
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,11 +35,11 @@
 
 -include $(TOPDIR)/Make.defs
 
-ASRCS		= 
-CSRCS		= up_boot.c 
+ASRCS		=
+CSRCS		= avr_boot.c
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
-CSRCS		+= up_leds.c
+CSRCS		+= avr_leds.c
 endif
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
@@ -58,14 +58,14 @@ 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)/chip}"
+  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
   CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}"
   CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)/atmega2560}"
 else
   CFLAGS	+= -I "$(TOPDIR)/sched"
   CFLAGS	+= -I "$(ARCH_SRCDIR)/chip"
-  CFLAGS	+= -I "$(ARCH_SRCDIR)/common" 
+  CFLAGS	+= -I "$(ARCH_SRCDIR)/common"
   CFLAGS	+= -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)"
   CFLAGS	+= -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)/atmega2560"
 endif
diff --git a/configs/arduino-mega2560/src/arduino_mega2560_internal.h b/configs/arduino-mega2560/src/arduino_mega2560.h
similarity index 93%
rename from configs/arduino-mega2560/src/arduino_mega2560_internal.h
rename to configs/arduino-mega2560/src/arduino_mega2560.h
index ba82b63aed..5f9eb09fe5 100644
--- a/configs/arduino-mega2560/src/arduino_mega2560_internal.h
+++ b/configs/arduino-mega2560/src/arduino_mega2560.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __CONFIGS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_INTERNAL_H
-#define __CONFIGS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_INTERNAL_H
+#ifndef __CONFIGS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_H
+#define __CONFIGS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_H
 
 /****************************************************************************
  * Included Files
@@ -74,4 +74,4 @@ void atmega_led_initialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CONFIGS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_INTERNAL_H */
+#endif /* __CONFIGS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_H */
diff --git a/configs/arduino-mega2560/src/up_boot.c b/configs/arduino-mega2560/src/avr_boot.c
similarity index 94%
rename from configs/arduino-mega2560/src/up_boot.c
rename to configs/arduino-mega2560/src/avr_boot.c
index b671359b3c..a56cc2eb0a 100644
--- a/configs/arduino-mega2560/src/up_boot.c
+++ b/configs/arduino-mega2560/src/avr_boot.c
@@ -1,7 +1,7 @@
 /******************************************************************************
- * configs/arduino-mega2560/src/up_boot.c
+ * configs/arduino-mega2560/src/avr_boot.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 #include "up_internal.h"
 
 #include "atmega_internal.h"
-#include "arduino_mega2560_internal.h"
+#include "arduino_mega2560.h"
 
 /******************************************************************************
  * Definitions
@@ -65,9 +65,9 @@
  * Name: up_boardinitialize
  *
  * Description:
- *   All ATMega architectures must provide the following entry point.  
- *   This entry point is called early in the intitialization -- after all 
- *   memory has been configured and mapped but before any devices have been 
+ *   All ATMega architectures must provide the following entry point.
+ *   This entry point is called early in the intitialization -- after all
+ *   memory has been configured and mapped but before any devices have been
  *   initialized.
  *
  ******************************************************************************/
@@ -80,4 +80,3 @@ void atmega_boardinitialize(void)
   atmega_led_initialize();
 #endif
 }
-
diff --git a/configs/arduino-mega2560/src/up_leds.c b/configs/arduino-mega2560/src/avr_leds.c
similarity index 94%
rename from configs/arduino-mega2560/src/up_leds.c
rename to configs/arduino-mega2560/src/avr_leds.c
index 8ec064a6f0..c33096cbb0 100644
--- a/configs/arduino-mega2560/src/up_leds.c
+++ b/configs/arduino-mega2560/src/avr_leds.c
@@ -1,7 +1,7 @@
 /******************************************************************************
- * configs/arduino-mega2560/src/up_boot.c
+ * configs/arduino-mega2560/src/avr_leds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 #include "up_internal.h"
 
 #include "atmega2560_internal.h"
-#include "arduino_mega2560_internal.h"
+#include "arduino_mega2560.h"
 
 /****************************************************************************
  * Name: board_autoled_initialize
@@ -73,4 +73,5 @@ void board_autoled_on(int led)
 void board_autoled_off(int led)
 {
 }
-#endoif 
+
+#endif /* CONFIG_ARCH_LEDS */