diff --git a/configs/moteino-mega/include/board.h b/configs/moteino-mega/include/board.h
index 2fc1b38947..e9a5138dc0 100644
--- a/configs/moteino-mega/include/board.h
+++ b/configs/moteino-mega/include/board.h
@@ -1,6 +1,5 @@
 /****************************************************************************
  * configs/moteino-mega/include/board.h
- * include/arch/board/board.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/moteino-mega/src/Makefile b/configs/moteino-mega/src/Makefile
index b9b8dae971..6d95aff436 100644
--- a/configs/moteino-mega/src/Makefile
+++ b/configs/moteino-mega/src/Makefile
@@ -36,10 +36,10 @@
 -include $(TOPDIR)/Make.defs
 
 ASRCS		=
-CSRCS		= up_boot.c
+CSRCS		= avr_boot.c
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
-CSRCS		+= up_leds.c
+CSRCS		+= avr_leds.c
 endif
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
diff --git a/configs/moteino-mega/src/up_boot.c b/configs/moteino-mega/src/avr_boot.c
similarity index 98%
rename from configs/moteino-mega/src/up_boot.c
rename to configs/moteino-mega/src/avr_boot.c
index f845939f5a..e38da636bd 100644
--- a/configs/moteino-mega/src/up_boot.c
+++ b/configs/moteino-mega/src/avr_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/moteino-mega/src/up_boot.c
+ * configs/moteino-mega/src/avr_boot.c
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -47,7 +47,7 @@
 #include "up_internal.h"
 
 #include "atmega_internal.h"
-#include "moteino_mega_internal.h"
+#include "moteino_mega.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/configs/moteino-mega/src/up_leds.c b/configs/moteino-mega/src/avr_leds.c
similarity index 98%
rename from configs/moteino-mega/src/up_leds.c
rename to configs/moteino-mega/src/avr_leds.c
index 68ffaa48af..da1b651749 100644
--- a/configs/moteino-mega/src/up_leds.c
+++ b/configs/moteino-mega/src/avr_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/moteino-mega/src/up_leds.c
+ * configs/moteino-mega/src/avr_leds.c
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -47,7 +47,7 @@
 #include "up_internal.h"
 
 #include "atmega_internal.h"
-#include "moteino_mega_internal.h"
+#include "moteino_mega.h"
 
 #ifdef CONFIG_ARCH_LEDS
 
diff --git a/configs/moteino-mega/src/moteino_mega_internal.h b/configs/moteino-mega/src/moteino_mega.h
similarity index 94%
rename from configs/moteino-mega/src/moteino_mega_internal.h
rename to configs/moteino-mega/src/moteino_mega.h
index d697228385..08c97879d1 100644
--- a/configs/moteino-mega/src/moteino_mega_internal.h
+++ b/configs/moteino-mega/src/moteino_mega.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/moteino-mega/src/moteino-mega-internal.h
+ * configs/moteino-mega/src/moteino-mega.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __CONFIGS_MOTEINO_MEGA_SRC_MOTEINO_MEGA_INTERNAL_H
-#define __CONFIGS_MOTEINO_MEGA_SRC_MOTEINO_MEGA_INTERNAL_H
+#ifndef __CONFIGS_MOTEINO_MEGA_SRC_MOTEINO_MEGA_H
+#define __CONFIGS_MOTEINO_MEGA_SRC_MOTEINO_MEGA_H
 
 /****************************************************************************
  * Included Files
@@ -99,4 +99,4 @@ void atmega_ledinit(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CONFIGS_MOTEINO_MEGA_SRC_MOTEINO_MEGA_INTERNAL_H */
+#endif /* __CONFIGS_MOTEINO_MEGA_SRC_MOTEINO_MEGA_H */