diff --git a/arch/arm/core/isr_wrapper.s b/arch/arm/core/isr_wrapper.s
index 8da828bfccf..d53058372a5 100644
--- a/arch/arm/core/isr_wrapper.s
+++ b/arch/arm/core/isr_wrapper.s
@@ -79,7 +79,8 @@ SECTION_FUNC(TEXT, _isr_wrapper)
      * the device for the next timer deadline is not interrupted.
      * For non-tickless idle, this ensures that the clearing of the kernel idle
      * state is not interrupted.
-     * In each case, _SysPowerSaveIdleExit is called with interrupts disabled.
+     * In each case, _sys_power_save_idle_exit is called with interrupts 
+     * disabled.
      */
     cpsid i  /* PRIMASK = 1 */
 
@@ -90,7 +91,7 @@ SECTION_FUNC(TEXT, _isr_wrapper)
     ittt ne
 	movne	r1, #0
         strne	r1, [r2, #__tNANO_idle_OFFSET]  /* clear kernel idle state */
-	blxne	_SysPowerSaveIdleExit
+	blxne	_sys_power_save_idle_exit
 
     cpsie i		/* re-enable interrupts (PRIMASK = 0) */
 #endif /* CONFIG_ADVANCED_POWER_MANAGEMENT */
diff --git a/arch/arm/timer/systick.c b/arch/arm/timer/systick.c
index 4fc36732bd5..81058c0edb4 100644
--- a/arch/arm/timer/systick.c
+++ b/arch/arm/timer/systick.c
@@ -112,7 +112,7 @@ extern uint32_t _hw_irq_to_c_handler_latency;
 #ifdef CONFIG_ADVANCED_POWER_MANAGEMENT
 extern int32_t _NanoIdleValGet(void);
 extern void _NanoIdleValClear(void);
-extern void _SysPowerSaveIdleExit(int32_t ticks);
+extern void _sys_power_save_idle_exit(int32_t ticks);
 #endif /* CONFIG_ADVANCED_POWER_MANAGEMENT */
 
 #ifdef CONFIG_TICKLESS_IDLE
@@ -292,7 +292,7 @@ void _TIMER_INT_HANDLER(void *unused)
 	 * For non-tickless idle, this ensures that the clearing of the kernel
 	 * idle
 	 * state is not interrupted.
-	 * In each case, _SysPowerSaveIdleExit is called with interrupts
+	 * In each case, _sys_power_save_idle_exit is called with interrupts
 	 * disabled.
 	 */
 	__asm__(" cpsid i"); /* PRIMASK = 1 */
@@ -361,7 +361,7 @@ void _TIMER_INT_HANDLER(void *unused)
 		 * Note that for tickless idle, nothing will be done in
 		 * _timer_idle_exit.
 		 */
-		_SysPowerSaveIdleExit(numIdleTicks);
+		_sys_power_save_idle_exit(numIdleTicks);
 	}
 
 	__asm__(" cpsie i"); /* re-enable interrupts (PRIMASK = 0) */
@@ -540,7 +540,7 @@ void _timer_idle_enter(int32_t ticks /* system ticks */
 *
 * _timer_idle_exit - handling of tickless idle when interrupted
 *
-* The routine, called by _SysPowerSaveIdleExit, is responsible for taking
+* The routine, called by _sys_power_save_idle_exit, is responsible for taking
 * the timer out of idle mode and generating an interrupt at the next
 * tick interval.  It is expected that interrupts have been disabled.
 *
diff --git a/arch/x86/core/intstub.s b/arch/x86/core/intstub.s
index 9b554efbb04..289d0fa92aa 100644
--- a/arch/x86/core/intstub.s
+++ b/arch/x86/core/intstub.s
@@ -66,7 +66,7 @@ entering and exiting a C interrupt handler.
 	GTEXT(_Swap)
 
 #ifdef CONFIG_ADVANCED_POWER_MANAGEMENT
-	GTEXT(_SysPowerSaveIdleExit)
+	GTEXT(_sys_power_save_idle_exit)
 #endif /* CONFIG_ADVANCED_POWER_MANAGEMENT */
 
 
@@ -223,13 +223,13 @@ BRANCH_LABEL(_HandleIdle)
 	movl	$0, __tNANO_idle_OFFSET(%ecx)
 
 	/*
-	 * Beware that a timer driver's _SysPowerSaveIdleExit() implementation might
+	 * Beware that a timer driver's _sys_power_save_idle_exit() implementation might
 	 * expect that interrupts are disabled when invoked.  This ensures that
 	 * the calculation and programming of the device for the next timer
 	 * deadline is not interrupted.
 	 */
 	 
-	call	_SysPowerSaveIdleExit
+	call	_sys_power_save_idle_exit
 	add	$0x4, %esp
 #ifdef CONFIG_INT_LATENCY_BENCHMARK
 	call	_int_latency_stop
diff --git a/kernel/microkernel/power.c b/kernel/microkernel/power.c
index 374c86e5aea..f698c9251c7 100644
--- a/kernel/microkernel/power.c
+++ b/kernel/microkernel/power.c
@@ -112,7 +112,7 @@ void _sys_power_save_idle(int32_t ticks)
 
 /*******************************************************************************
 *
-* _SysPowerSaveIdleExit - power management policy when kernel leaves idle state
+* _sys_power_save_idle_exit - power management policy when kernel leaves idle state
 *
 * This routine implements the power management policy when kernel leaves idle
 * state. Routine can be modified to wake up other devices.
@@ -123,7 +123,7 @@ void _sys_power_save_idle(int32_t ticks)
 * \NOMANUAL
 */
 
-void _SysPowerSaveIdleExit(int32_t ticks)
+void _sys_power_save_idle_exit(int32_t ticks)
 {
 #ifdef CONFIG_TICKLESS_IDLE
 	if ((ticks == -1) || ticks >= _sys_idle_threshold_ticks) {