diff --git a/ChangeLog b/ChangeLog
index 1dd1bee589..a110b5a06c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -4680,7 +4680,7 @@
 	* arch/arm/src/kl/kl_gpio.c and .h, configs/freedom-kl25z/src/freedom-kl25z.h,
 	  and configs/freedom-kl25z/src/kl_led.c:  Fixes LEDs on the Freedom KL25Z
 	  board (2013-5-6).
-	* arch/arm/src/kinetis/kinetis_pin.c and arch/arm/src/kinetis/kinetis_internal.h:
+	* arch/arm/src/kinetis/kinetis_pin.c and arch/arm/src/kinetis/kinetis.h:
 	  The Kinetis GPIO logic had some of the same issues as did the
 	  Kinetis L (2013-5-6).
 	* arch/arm/src/stm32/stm32_idle.c: Add an option to conditionally disable
diff --git a/arch b/arch
index 230f8d050f..4e962ff8a0 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 230f8d050f4cb535b4047ba2e5fbea8b50b70671
+Subproject commit 4e962ff8a0a2f15247232d7e9aef89032c9b2898
diff --git a/configs b/configs
index f6782b7548..05b3084913 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit f6782b75481a49e19709a7e1593d40346716f5e4
+Subproject commit 05b30849130f836b352cc84196b2369679fbe5ec
diff --git a/drivers/power/pm_internal.h b/drivers/power/pm.h
similarity index 97%
rename from drivers/power/pm_internal.h
rename to drivers/power/pm.h
index 6499c65eaf..8ed66d3d30 100644
--- a/drivers/power/pm_internal.h
+++ b/drivers/power/pm.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/power/pm_internal.h
+ * drivers/power/pm
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __DRIVERS_POWER_PM_INTERNAL_H
-#define __DRIVERS_POWER_PM_INTERNAL_H
+#ifndef __DRIVERS_POWER_PM_H
+#define __DRIVERS_POWER_PM_H
 
 /****************************************************************************
  * Included Files
@@ -207,4 +207,4 @@ EXTERN void pm_update(int16_t accum);
 #endif
 
 #endif /* CONFIG_PM */
-#endif /* #define __DRIVERS_POWER_PM_INTERNAL_H */
+#endif /* #define __DRIVERS_POWER_PM_H */
diff --git a/drivers/power/pm_activity.c b/drivers/power/pm_activity.c
index f6dceeea37..d80315605c 100644
--- a/drivers/power/pm_activity.c
+++ b/drivers/power/pm_activity.c
@@ -43,7 +43,7 @@
 #include <nuttx/clock.h>
 #include <arch/irq.h>
 
-#include "pm_internal.h"
+#include "pm"
 
 #ifdef CONFIG_PM
 
diff --git a/drivers/power/pm_changestate.c b/drivers/power/pm_changestate.c
index f64760f55b..ee47405260 100644
--- a/drivers/power/pm_changestate.c
+++ b/drivers/power/pm_changestate.c
@@ -42,7 +42,7 @@
 #include <nuttx/power/pm.h>
 #include <arch/irq.h>
 
-#include "pm_internal.h"
+#include "pm"
 
 #ifdef CONFIG_PM
 
diff --git a/drivers/power/pm_checkstate.c b/drivers/power/pm_checkstate.c
index 13adc5d5ce..37ea02ca04 100644
--- a/drivers/power/pm_checkstate.c
+++ b/drivers/power/pm_checkstate.c
@@ -43,7 +43,7 @@
 #include <nuttx/clock.h>
 #include <arch/irq.h>
 
-#include "pm_internal.h"
+#include "pm"
 
 #ifdef CONFIG_PM
 
diff --git a/drivers/power/pm_initialize.c b/drivers/power/pm_initialize.c
index b4f7458779..1fc5ff479f 100644
--- a/drivers/power/pm_initialize.c
+++ b/drivers/power/pm_initialize.c
@@ -43,7 +43,7 @@
 
 #include <nuttx/power/pm.h>
 
-#include "pm_internal.h"
+#include "pm"
 
 #ifdef CONFIG_PM
 
diff --git a/drivers/power/pm_register.c b/drivers/power/pm_register.c
index 19f94cb026..c7a61f88cc 100644
--- a/drivers/power/pm_register.c
+++ b/drivers/power/pm_register.c
@@ -44,7 +44,7 @@
 
 #include <nuttx/power/pm.h>
 
-#include "pm_internal.h"
+#include "pm"
 
 #ifdef CONFIG_PM
 
diff --git a/drivers/power/pm_update.c b/drivers/power/pm_update.c
index 7392029935..0909836065 100644
--- a/drivers/power/pm_update.c
+++ b/drivers/power/pm_update.c
@@ -44,7 +44,7 @@
 #include <nuttx/power/pm.h>
 #include <nuttx/wqueue.h>
 
-#include "pm_internal.h"
+#include "pm"
 
 #ifdef CONFIG_PM