diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index 0141bfde649..6d8976237a0 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -272,7 +272,7 @@ config NATIVE_APPLICATION
 	  Build as a native application that can run on the host and using
 	  resources and libraries provided by the host.
 
-choice
+choice COMPILER_OPTIMIZATIONS
 	prompt "Optimization level"
 	default NO_OPTIMIZATIONS    if COVERAGE
 	default DEBUG_OPTIMIZATIONS if DEBUG
diff --git a/subsys/fs/Kconfig.fatfs b/subsys/fs/Kconfig.fatfs
index 99018fb53d5..7b897de9477 100644
--- a/subsys/fs/Kconfig.fatfs
+++ b/subsys/fs/Kconfig.fatfs
@@ -65,7 +65,7 @@ config FS_FATFS_LFN
 
 if FS_FATFS_LFN
 
-choice
+choice FS_FATFS_LFN_MODE
 	prompt "LFN memory mode"
 	default FS_FATFS_LFN_MODE_BSS
 
diff --git a/subsys/logging/Kconfig.backends b/subsys/logging/Kconfig.backends
index 10fcadc92f6..59d7bdfc618 100644
--- a/subsys/logging/Kconfig.backends
+++ b/subsys/logging/Kconfig.backends
@@ -19,7 +19,7 @@ config LOG_BACKEND_UART_OUTPUT_DICTIONARY
 	help
 	  UART backend is in dictionary-based logging output mode.
 
-choice
+choice LOG_BACKEND_UART_OUTPUT
 	prompt "UART Backend Output Mode"
 	default LOG_BACKEND_UART_OUTPUT_TEXT
 
@@ -99,7 +99,7 @@ config LOG_BACKEND_RTT
 
 if LOG_BACKEND_RTT
 
-choice
+choice LOG_BACKEND_RTT_MODE
 	prompt "Logger behavior"
 	default LOG_BACKEND_RTT_MODE_BLOCK
 
@@ -321,7 +321,7 @@ config LOG_BACKEND_FS_OUTPUT_DICTIONARY
 	help
 	  FS backend is in dictionary-based logging output mode.
 
-choice
+choice LOG_BACKEND_FS_OUTPUT
 	prompt "FS Backend Output Mode"
 	default LOG_BACKEND_FS_OUTPUT_TEXT
 
diff --git a/subsys/pm/policy/Kconfig b/subsys/pm/policy/Kconfig
index 059ac7fd172..ca9cb3fc039 100644
--- a/subsys/pm/policy/Kconfig
+++ b/subsys/pm/policy/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-choice
+choice PM_POLICY
 	prompt "Idle State Power Management Policy"
 	help
 	  Select the idle state power management policy.