diff --git a/arch/ceva/src/common/up_userspace.c b/arch/ceva/src/common/up_userspace.c
index 5e34e3bc01f..bcf643bb11d 100644
--- a/arch/ceva/src/common/up_userspace.c
+++ b/arch/ceva/src/common/up_userspace.c
@@ -189,7 +189,7 @@ const struct userspace_s userspace __attribute__ ((section ("userspace"))) =
 
   .us_base            =
   {
-    .us_entrypoint    = CONFIG_USER_ENTRYPOINT,
+    .us_entrypoint    = CONFIG_INIT_ENTRYPOINT,
     .us_textstart     = (uintptr_t)g_textstart,
     .us_textend       = (uintptr_t)g_textend,
     .us_datasource    = (uintptr_t)g_datasource,
diff --git a/boards/sparc/bm3823/xx3823/configs/nsh/defconfig b/boards/sparc/bm3823/xx3823/configs/nsh/defconfig
index b3b1b300a3a..447267419f2 100644
--- a/boards/sparc/bm3823/xx3823/configs/nsh/defconfig
+++ b/boards/sparc/bm3823/xx3823/configs/nsh/defconfig
@@ -32,6 +32,7 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_HELLO_STACKSIZE=4096
 CONFIG_EXAMPLES_NULL=y
 CONFIG_FS_WRITABLE=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_MAX_TASKS=16
@@ -61,5 +62,4 @@ CONFIG_UART1_BAUD=9600
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_UART2_BAUD=9600
 CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 7f686fd8bb0..c542c20a50d 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -232,7 +232,7 @@ config TTY_LAUNCH_FILEPATH
 	---help---
 		The name of the entry point for user applications.  For the example
 		applications this is of the form 'app_main' where 'app' is the application
-		name. If not defined, USER_ENTRYPOINT defaults to "main".
+		name. If not defined, INIT_ENTRYPOINT defaults to "main".
 
 endif # TTY_LAUNCH