diff --git a/kernel/Kconfig b/kernel/Kconfig
index 8eddd62b728..f2197a198cf 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -54,7 +54,7 @@ config SYS_CLOCK_TICKS_PER_SEC
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	int
-	#The value is set by each BSP Kconfig file.
+	#The value is set by each platform's Kconfig file.
 	help
 	Frequency of the hardware timer used for the system clock
 	(in Hz).
@@ -83,7 +83,7 @@ config  XIP
 	prompt "Execute in place"
 	help
 	  This option allows the kernel to operate with its text and read-only
-	  sections residing in ROM (or similar read-only memory). Not all BSPs
+	  sections residing in ROM (or similar read-only memory). Not all platforms
 	  support this option so it must be used with care; you must also
 	  supply a linker command file when building your image. Enabling this
 	  option increases both the code and data footprint of the image.
diff --git a/kernel/microkernel/Kconfig b/kernel/microkernel/Kconfig
index 86adbd077c5..37203b00f4b 100644
--- a/kernel/microkernel/Kconfig
+++ b/kernel/microkernel/Kconfig
@@ -197,10 +197,10 @@ config ADVANCED_POWER_MANAGEMENT
 	default n
 	depends on MICROKERNEL
 	help
-	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().
+	This option enables the platform to implement extra power management
+	policies whenever the kernel becomes idle. The kernel invokes
+	_sys_power_save_idle() to inform the power management subsystem of the
+	number of ticks until the next kernel timer is due to expire.
 
 menu "Advanced Power Management Features"
 	depends on MICROKERNEL && ADVANCED_POWER_MANAGEMENT && ADVANCED_IDLE_SUPPORTED
diff --git a/kernel/microkernel/k_idle.c b/kernel/microkernel/k_idle.c
index 47454860a02..3caa088f00a 100644
--- a/kernel/microkernel/k_idle.c
+++ b/kernel/microkernel/k_idle.c
@@ -401,10 +401,9 @@ static inline int32_t _get_next_timer_expiry(void)
  *
  * @brief Power saving when idle
  *
- * If the BSP sets the _sys_power_save_flag flag, this routine will call the
- * _sys_power_save_idle() routine in an infinite loop. If the flag is not set,
- * this routine will fall through and _k_kernel_idle() will try the next idling
- * mechanism.
+ * If _sys_power_save_flag is non-zero, this routine keeps the system in a low
+ * power state whenever the kernel is idle. If it is zero, this routine will
+ * fall through and _k_kernel_idle() will try the next idling mechanism.
  *
  * @return N/A
  *
@@ -421,9 +420,9 @@ static void _power_save(void)
 			_sys_power_save_idle(_get_next_timer_expiry());
 #else
 			/*
-			 * nano_cpu_idle () is invoked here directly only if APM is
-			 * disabled. Otherwise BSP decides either to invoke it or
-			 * to implement advanced idle functionality
+			 * nano_cpu_idle() is invoked here directly only if APM is
+			 * disabled. Otherwise the microkernel decides either to invoke
+			 * it or to implement advanced idle functionality
 			 */
 
 			nano_cpu_idle();
diff --git a/kernel/nanokernel/Kconfig b/kernel/nanokernel/Kconfig
index 080e49de7e7..66a6d07cf00 100644
--- a/kernel/nanokernel/Kconfig
+++ b/kernel/nanokernel/Kconfig
@@ -48,7 +48,7 @@ config INT_LATENCY_BENCHMARK
 	depends on ARCH="x86" && EXPERIMENTAL
 	help
 	This option enables the tracking of interrupt latency metrics;
-	the exact set of metrics being tracked is BSP-dependent.
+	the exact set of metrics being tracked is platform-dependent.
 	Tracking begins when intLatencyInit() is invoked by an application.
 	The metrics are displayed (and a new sampling interval is started)
 	each time intLatencyShow() is called thereafter.
diff --git a/kernel/nanokernel/nano_init.c b/kernel/nanokernel/nano_init.c
index 4be9c258612..b1967fa5ff1 100644
--- a/kernel/nanokernel/nano_init.c
+++ b/kernel/nanokernel/nano_init.c
@@ -254,8 +254,8 @@ extern void *__stack_chk_guard;
  *
  * @brief Initialize nanokernel
  *
- * This routine is invoked by the BSP when the system is ready to run C code.
- * The processor must be running in 32-bit mode, and the BSS must have been
+ * This routine is invoked when the system is ready to run C code. The
+ * processor must be running in 32-bit mode, and the BSS must have been
  * cleared/zeroed.
  *
  * @return Does not return