diff --git a/configs/mirtoo/src/mirtoo-internal.h b/configs/mirtoo/src/mirtoo.h
similarity index 92%
rename from configs/mirtoo/src/mirtoo-internal.h
rename to configs/mirtoo/src/mirtoo.h
index ffc18c2e1df..81c93fe8996 100644
--- a/configs/mirtoo/src/mirtoo-internal.h
+++ b/configs/mirtoo/src/mirtoo.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/mirtoo/src/mirtoo-internal.h
+ * configs/mirtoo/src/mirtoo.h
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __CONFIGS_MIRTOO_SRC_MIRTOO_INTERNAL_H
-#define __CONFIGS_MIRTOO_SRC_MIRTOO_INTERNAL_H
+#ifndef __CONFIGS_MIRTOO_SRC_MIRTOO_H
+#define __CONFIGS_MIRTOO_SRC_MIRTOO_H
 
 /****************************************************************************
  * Included Files
@@ -82,7 +82,7 @@ void weak_function pic32mx_spi2initialize(void);
 #endif
 
 /************************************************************************************
- * Name: pic32mx_autoled_initialize
+ * Name: pic32mx_led_initialize
  *
  * Description:
  *   Configure on-board LEDs if LED support has been selected.
@@ -90,7 +90,7 @@ void weak_function pic32mx_spi2initialize(void);
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_LEDS
-void pic32mx_autoled_initialize(void);
+void pic32mx_led_initialize(void);
 #endif
 
 /****************************************************************************
@@ -111,4 +111,4 @@ void pic32mx_autoled_initialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CONFIGS_MIRTOO_SRC_MIRTOO_INTERNAL_H */
+#endif /* __CONFIGS_MIRTOO_SRC_MIRTOO_H */
diff --git a/configs/mirtoo/src/pic32_adc.c b/configs/mirtoo/src/pic32_adc.c
index 18bbfbb6aa0..7fc8196e023 100644
--- a/configs/mirtoo/src/pic32_adc.c
+++ b/configs/mirtoo/src/pic32_adc.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 
 #include "pic32mx-internal.h"
-#include "mirtoo-internal.h"
+#include "mirtoo.h"
 
 #ifdef CONFIG_PIC32MX_ADC
 
diff --git a/configs/mirtoo/src/pic32_boot.c b/configs/mirtoo/src/pic32_boot.c
index 90d4d8f1425..ef655f73f20 100644
--- a/configs/mirtoo/src/pic32_boot.c
+++ b/configs/mirtoo/src/pic32_boot.c
@@ -48,7 +48,7 @@
 
 #include "pic32mx-internal.h"
 #include "pic32mx-pps.h"
-#include "mirtoo-internal.h"
+#include "mirtoo.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -155,6 +155,6 @@ void pic32mx_boardinitialize(void)
   /* Configure on-board LEDs if LED support has been selected. */
 
 #ifdef CONFIG_ARCH_LEDS
-  pic32mx_autoled_initialize();
+  pic32mx_led_initialize();
 #endif
 }
diff --git a/configs/mirtoo/src/pic32_leds.c b/configs/mirtoo/src/pic32_leds.c
index 296bf911694..a87a51d293b 100644
--- a/configs/mirtoo/src/pic32_leds.c
+++ b/configs/mirtoo/src/pic32_leds.c
@@ -47,7 +47,7 @@
 #include <arch/board/board.h>
 
 #include "pic32mx-internal.h"
-#include "mirtoo-internal.h"
+#include "mirtoo.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -232,11 +232,11 @@ void board_userled_all(uint8_t ledset)
 #endif
 
 /****************************************************************************
- * Name: pic32mx_autoled_initialize
+ * Name: pic32mx_led_initialize
  ****************************************************************************/
 
-#ifndef CONFIG_ARCH_LEDS
-void pic32mx_autoled_initialize(void)
+#ifdef CONFIG_ARCH_LEDS
+void pic32mx_led_initialize(void)
 {
   /* Configure output pins */
 
diff --git a/configs/mirtoo/src/pic32_spi2.c b/configs/mirtoo/src/pic32_spi2.c
index 5f454b8cf7c..11f6ec27f86 100644
--- a/configs/mirtoo/src/pic32_spi2.c
+++ b/configs/mirtoo/src/pic32_spi2.c
@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "pic32mx-internal.h"
 #include "pic32mx-pps.h"
-#include "mirtoo-internal.h"
+#include "mirtoo.h"
 
 #ifdef CONFIG_PIC32MX_SPI2