diff --git a/system/setlogmask/Kconfig b/system/setlogmask/Kconfig
index 1f31eaf11..c83e0b20f 100644
--- a/system/setlogmask/Kconfig
+++ b/system/setlogmask/Kconfig
@@ -21,7 +21,7 @@ config SYSTEM_SETLOGMASK_PRIORITY
 	int "setlogmask task priority"
 	default 100
 
-config SYSTEM_SET_LOGMASK_STACKSIZE
+config SYSTEM_SETLOGMASK_STACKSIZE
 	int "setlogmask stack size"
 	default DEFAULT_TASK_STACKSIZE
 
diff --git a/system/spi/Kconfig b/system/spi/Kconfig
index 42b9bae6c..cbd6a575f 100644
--- a/system/spi/Kconfig
+++ b/system/spi/Kconfig
@@ -15,7 +15,7 @@ if SYSTEM_SPITOOL
 
 config SPITOOL_PROGNAME
 	string "Program name"
-	default "hello"
+	default "spi"
 	---help---
 		This is the name of the program that will be used when the ELF
 		program is installed.
diff --git a/system/tee/Makefile b/system/tee/Makefile
index f8153fe65..ca1929d9f 100644
--- a/system/tee/Makefile
+++ b/system/tee/Makefile
@@ -41,7 +41,7 @@ include $(APPDIR)/Make.defs
 
 PROGNAME  = tee
 PRIORITY  = $(CONFIG_SYSTEM_TEE_PRIORITY)
-STACKSIZE = $(CONFIG_SYSTEM_TEE_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_TEE_STACKSIZE)
 MODULE    = $(CONFIG_SYSTEM_TEE)
 
 MAINSRC = tee.c
diff --git a/system/telnet/Makefile b/system/telnet/Makefile
index 792f0cd2d..f90df9b4e 100644
--- a/system/telnet/Makefile
+++ b/system/telnet/Makefile
@@ -43,7 +43,7 @@ PROGNAME = $(CONFIG_SYSTEM_TELNET_CHATD_PROGNAME)
 PRIORITY = $(CONFIG_SYSTEM_TELNET_CHATD_PRIORITY)
 STACKSIZE = $(CONFIG_SYSTEM_TELNET_CHATD_STACKSIZE)
 
-MODULE = $(CONFIG_CONFIG_SYSTEM_TELNET_CHATD)
+MODULE = $(CONFIG_SYSTEM_TELNET_CHATD)
 
 endif
 
@@ -55,7 +55,7 @@ PROGNAME += $(CONFIG_SYSTEM_TELNET_CLIENT_PROGNAME)
 PRIORITY += $(CONFIG_SYSTEM_TELNET_CLIENT_PRIORITY)
 STACKSIZE += $(CONFIG_SYSTEM_TELNET_CLIENT_STACKSIZE)
 
-MODULE = $(CONFIG_CONFIG_SYSTEM_TELNET_CLIENT)
+MODULE = $(CONFIG_SYSTEM_TELNET_CLIENT)
 
 endif