diff --git a/arch/arm/src/imx6/Kconfig b/arch/arm/src/imx6/Kconfig
index f49dde32bf6..e9ad1e59b27 100644
--- a/arch/arm/src/imx6/Kconfig
+++ b/arch/arm/src/imx6/Kconfig
@@ -9,7 +9,7 @@ menu "iMX.6 Chip Selection"
 
 choice
 	prompt "iMX.6 Core Configuration"
-	default IMX6_6QUAD
+	default ARCH_CHIP_IMX6_6QUAD
 
 config ARCH_CHIP_IMX6_6SOLOLITE
 	bool "i.MX 6SoloLite"
diff --git a/arch/arm/src/samd2l2/Kconfig b/arch/arm/src/samd2l2/Kconfig
index 89936c0b470..152475df6e0 100644
--- a/arch/arm/src/samd2l2/Kconfig
+++ b/arch/arm/src/samd2l2/Kconfig
@@ -8,7 +8,7 @@ comment "Atmel SAMD/L Configuration Options"
 choice
 	prompt "Atmel SAMD/L Chip Selection"
 	default ARCH_CHIP_SAMD20J18 if ARCH_CHIP_SAMD2X
-	default ARCH_CHIP_SAMD21J18 if ARCH_CHIP_SAML2X
+	default ARCH_CHIP_SAMD21J18A if ARCH_CHIP_SAML2X
 	depends on ARCH_CHIP_SAMD2X || ARCH_CHIP_SAML2X
 
 config ARCH_CHIP_SAMD20E14
diff --git a/arch/arm/src/samd5e5/Kconfig b/arch/arm/src/samd5e5/Kconfig
index 13436aae377..bc7c22e7ba4 100644
--- a/arch/arm/src/samd5e5/Kconfig
+++ b/arch/arm/src/samd5e5/Kconfig
@@ -8,7 +8,7 @@ comment "Microchip SAMD5x/E5x Configuration Options"
 choice
 	prompt "Microchip SAMD5x/E5x Chip Selection"
 	default ARCH_CHIP_SAMD51P19 if ARCH_CHIP_SAMD5X
-	default ARCH_CHIP_ATSAME54P20A if ARCH_CHIP_SAME5X
+	default ARCH_CHIP_SAME54P20 if ARCH_CHIP_SAME5X
 	depends on ARCH_CHIP_SAMD5X || ARCH_CHIP_SAME5X
 
 config ARCH_CHIP_SAMD51P20
diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig
index e69e811fad5..4089053327d 100644
--- a/arch/arm/src/stm32f7/Kconfig
+++ b/arch/arm/src/stm32f7/Kconfig
@@ -9,7 +9,7 @@ comment "STM32 F7 Configuration Options"
 
 choice
 	prompt "STM32 F7 Chip Selection"
-	default ARCH_CHIP_STM32F746
+	default ARCH_CHIP_STM32F746NG
 	depends on ARCH_CHIP_STM32F7
 
 config ARCH_CHIP_STM32F722RC
diff --git a/arch/avr/Kconfig b/arch/avr/Kconfig
index 6f9a85c9748..d3e0899ff52 100644
--- a/arch/avr/Kconfig
+++ b/arch/avr/Kconfig
@@ -7,7 +7,7 @@ if ARCH_AVR
 
 choice
 	prompt "Atmel AVR chip selection"
-	default ARCH_CHIP_AT32UC3B0256
+	default ARCH_CHIP_AT32UC3
 
 config ARCH_CHIP_ATMEGA
 	bool "ATMega family"
diff --git a/arch/mips/src/pic32mz/Kconfig b/arch/mips/src/pic32mz/Kconfig
index 53f6ce20fa1..7eeb65b70da 100644
--- a/arch/mips/src/pic32mz/Kconfig
+++ b/arch/mips/src/pic32mz/Kconfig
@@ -8,7 +8,7 @@ comment "PIC32MZ Configuration Options"
 
 choice
 	prompt "PIC32MZ chip selection"
-	default ARCH_CHIP_PIC32MZ460F512L
+	default ARCH_CHIP_PIC32MZ2048ECH
 
 config ARCH_CHIP_PIC32MZ2048ECH
 	bool "PIC32MZ2048ECH"
diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig
index 645ad2c88e0..d55b85cced6 100644
--- a/arch/risc-v/Kconfig
+++ b/arch/risc-v/Kconfig
@@ -8,7 +8,7 @@ comment "RISC-V Options"
 
 choice
 	prompt "RISC-V chip selection"
-	default ARCH_CHIP_NR5M100
+	default ARCH_CHIP_NR5
 
 config ARCH_CHIP_NR5
 	bool "NEXT NanoRisc5"
@@ -32,7 +32,7 @@ config ARCH_FAMILY
 
 config ARCH_CHIP
 	string
-	default "nr5m100"	if ARCH_CHIP_NR5M100
+	default "nr5m100"	if ARCH_CHIP_NR5
 
 config NR5_MPU
 	bool "MPU support"
diff --git a/arch/z80/src/z180/Kconfig b/arch/z80/src/z180/Kconfig
index f1213c25e7a..4627d232d35 100644
--- a/arch/z80/src/z180/Kconfig
+++ b/arch/z80/src/z180/Kconfig
@@ -235,7 +235,7 @@ endmenu
 
 choice
 	prompt "Serial console"
-	default NO_SERIAL_CONSOLE
+	default Z180_NO_SERIAL_CONSOLE
 	depends on DEV_CONSOLE
 
 config Z180_UART0_SERIAL_CONSOLE
@@ -258,6 +258,9 @@ config Z180_ESCCB_SERIAL_CONSOLE
 	bool "ESCC Channel B"
 	depends on Z180_ESCCB
 
+config Z810_NO_SERIAL_CONSOLE
+	bool "No serial console"
+
 endchoice
 
 menu "UART0 Configuration"
diff --git a/arch/z80/src/z8/Kconfig b/arch/z80/src/z8/Kconfig
index 3c77bb14264..d0004f9a338 100644
--- a/arch/z80/src/z8/Kconfig
+++ b/arch/z80/src/z8/Kconfig
@@ -28,7 +28,7 @@ config Z8_TOOLCHAIN_ZDSII
 
 choice
 	prompt "ZDS-II Toolchain version"
-	default EZ80_ZDSII_V521
+	default EZ80_ZDSII_V522
 
 config Z8_ZDSII_V500
 	bool "ZDS-II 5.0.0"
diff --git a/drivers/lcd/Kconfig b/drivers/lcd/Kconfig
index e34016866cf..ebedd2db5d4 100644
--- a/drivers/lcd/Kconfig
+++ b/drivers/lcd/Kconfig
@@ -816,8 +816,8 @@ config LCD_SHARP_MEMLCD
 
 if LCD_SHARP_MEMLCD
 
-choice MEMLCD_MODEL
-	prompt "Choose Model"
+choice
+	prompt "Memory LCD Model"
 	default MEMLCD_LS013B7DH03
 
 config MEMLCD_LS013B7DH01
diff --git a/drivers/usbdev/Kconfig b/drivers/usbdev/Kconfig
index 780702cf5eb..47039ad1bef 100644
--- a/drivers/usbdev/Kconfig
+++ b/drivers/usbdev/Kconfig
@@ -17,7 +17,7 @@ config USBDEV_DUALSPEED
 	---help---
 		Hardware handles high and full speed operation (USB 2.0)
 
-choice USBDEV_POWERED
+choice
 	prompt "Select USB device powered"
 	default USBDEV_SELFPOWERED
 
@@ -29,7 +29,7 @@ config USBDEV_SELFPOWERED
 config USBDEV_BUSPOWERED
 	bool "Bus powered"
 	---help---
-		Will cause USB features to indicate that the device is self-powered
+		Will cause USB features to indicate that the device is not self-powered
 
 endchoice
 
diff --git a/net/Kconfig b/net/Kconfig
index fc0ee0717f8..13fe0336b30 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -198,7 +198,7 @@ config NET_TUN_PKTSIZE
 
 choice
 	prompt "Work queue"
-	default LOOPBACK_LPWORK if SCHED_LPWORK
+	default TUN_LPWORK if SCHED_LPWORK
 	default TUN_HPWORK if !SCHED_LPWORK && SCHED_HPWORK
 	depends on SCHED_WORKQUEUE
 	---help---
diff --git a/sched/Kconfig b/sched/Kconfig
index 9cfeefa65f7..bfb0ff015f4 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -550,7 +550,7 @@ config PTHREAD_MUTEX_TYPES
 choice
 	prompt "pthread mutex robustness"
 	default PTHREAD_MUTEX_ROBUST if !DEFAULT_SMALL
-	default PTHREAD_UNSAFE if DEFAULT_SMALL
+	default PTHREAD_MUTEX_UNSAFE if DEFAULT_SMALL
 
 config PTHREAD_MUTEX_ROBUST
 	bool "Robust mutexes"