diff --git a/arch/arm/core/cpu_idle.s b/arch/arm/core/cpu_idle.s
index 393780c9c9e..8e2e2d08180 100644
--- a/arch/arm/core/cpu_idle.s
+++ b/arch/arm/core/cpu_idle.s
@@ -122,7 +122,7 @@ SECTION_FUNC(TEXT, _NanoIdleValClear)
 * nano_cpu_idle - power save idle routine for ARM Cortex-M
 *
 * This function will be called by the nanokernel idle loop or possibly within
-* an implementation of _SysPowerSaveIdle in the microkernel when the
+* an implementation of _sys_power_save_idle in the microkernel when the
 * '_sys_power_save_flag' variable is non-zero.  The ARM 'wfi' instruction
 * will be issued, causing a low-power consumption sleep mode.
 *
diff --git a/arch/x86/core/cpuhalt.s b/arch/x86/core/cpuhalt.s
index 27577f05a17..b78fb23df73 100644
--- a/arch/x86/core/cpuhalt.s
+++ b/arch/x86/core/cpuhalt.s
@@ -34,7 +34,7 @@
 DESCRIPTION
 This module provides an implementation of the architecture-specific
 nano_cpu_idle() primitive required by the nanokernel idle loop component.
-It can be called within an implementation of _SysPowerSaveIdle(),
+It can be called within an implementation of _sys_power_save_idle(),
 which is provided for the microkernel by the BSP.
 
 The module also provides an implementation of nano_cpu_atomic_idle(), which
@@ -69,7 +69,7 @@ by nano_cpu_atomic_idle().
 * nano_cpu_idle - power save idle routine for IA-32
 *
 * This function will be called by the nanokernel idle loop or possibly within
-* an implementation of _SysPowerSaveIdle in the microkernel when the
+* an implementation of _sys_power_save_idle in the microkernel when the
 * '_sys_power_save_flag' variable is non-zero.  The IA-32 'hlt' instruction
 * will be issued causing a low-power consumption sleep mode.
 *
diff --git a/kernel/microkernel/idle.c b/kernel/microkernel/idle.c
index 4c53c63242b..dbbc083e4af 100644
--- a/kernel/microkernel/idle.c
+++ b/kernel/microkernel/idle.c
@@ -237,7 +237,7 @@ static inline int32_t _get_next_timer_expiry(void)
 * _power_save - power saving when idle
 *
 * If the BSP sets the _sys_power_save_flag flag, this routine will call the
-* _SysPowerSaveIdle() routine in an infinite loop. If the flag is not set,
+* _sys_power_save_idle() routine in an infinite loop. If the flag is not set,
 * this routine will fall through and kernel_idle() will try the next idling
 * mechanism.
 *
@@ -249,13 +249,13 @@ static void _power_save(void)
 {
 	extern void nano_cpu_idle(void);
 	extern unsigned char _sys_power_save_flag;
-	extern void _SysPowerSaveIdle(int32_t ticks);
+	extern void _sys_power_save_idle(int32_t ticks);
 
 	if (_sys_power_save_flag) {
 		for (;;) {
 			irq_lock_inline();
 #ifdef CONFIG_ADVANCED_POWER_MANAGEMENT
-			_SysPowerSaveIdle(_get_next_timer_expiry());
+			_sys_power_save_idle(_get_next_timer_expiry());
 #else
 			/*
 			 * nano_cpu_idle () is invoked here directly only if APM
diff --git a/kernel/microkernel/power.c b/kernel/microkernel/power.c
index af578a24888..374c86e5aea 100644
--- a/kernel/microkernel/power.c
+++ b/kernel/microkernel/power.c
@@ -32,7 +32,7 @@
 
 /*
 DESCRIPTION
-This module provides _sys_power_save_flag and _SysPowerSaveIdle(),
+This module provides _sys_power_save_flag and _sys_power_save_idle(),
 invoked within the microkernel idle loop.
 
 \INTERNAL
@@ -71,7 +71,7 @@ int32_t _sys_idle_threshold_ticks =
 
 /*******************************************************************************
 *
-* _SysPowerSaveIdle - power management policy when kernel is idle
+* _sys_power_save_idle - power management policy when kernel is idle
 *
 * This routine implements the power management policy based on the time
 * until the timer expires, in system ticks.
@@ -82,7 +82,7 @@ int32_t _sys_idle_threshold_ticks =
 * \NOMANUAL
 */
 
-void _SysPowerSaveIdle(int32_t ticks)
+void _sys_power_save_idle(int32_t ticks)
 {
 #if defined(CONFIG_TICKLESS_IDLE)
 	if ((ticks == -1) || ticks >= _sys_idle_threshold_ticks) {
diff --git a/make/target/kconfig/modules/apm.kconf b/make/target/kconfig/modules/apm.kconf
index 1fdf45e51f3..1ee0f9d43fb 100644
--- a/make/target/kconfig/modules/apm.kconf
+++ b/make/target/kconfig/modules/apm.kconf
@@ -43,7 +43,7 @@ config	ADVANCED_POWER_MANAGEMENT
 	  This option enables the BSP to implement extra power management
 	  policies whenever the kernel becomes idle. The kernel informs the
 	  BSP of the number of ticks until the next kernel timer expires by
-	  calling the BSP function _SysPowerSaveIdle().
+	  calling the BSP function _sys_power_save_idle().
 
 config  TICKLESS_IDLE
 	bool