diff --git a/configs/mikroe-stm32f4/kernel/up_userspace.c b/configs/mikroe-stm32f4/kernel/up_userspace.c
index b70a4e80a61..372d5302a09 100644
--- a/configs/mikroe-stm32f4/kernel/up_userspace.c
+++ b/configs/mikroe-stm32f4/kernel/up_userspace.c
@@ -130,7 +130,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
 
   /* User-space work queue support (declared in include/nuttx/wqueue.h) */
 
-#ifdef CONFIG_SCHED_USRWORK
+#ifdef CONFIG_LIB_USRWORK
   .work_usrstart    = work_usrstart,
 #endif
 };
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index ccddb67d743..1a48d8b3562 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -818,7 +818,7 @@ CONFIG_SCHED_WORKPRIORITY=192
 CONFIG_SCHED_WORKPERIOD=20000
 CONFIG_SCHED_WORKSTACKSIZE=2048
 # CONFIG_SCHED_LPWORK is not set
-# CONFIG_SCHED_USRWORK is not set
+# CONFIG_LIB_USRWORK is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/open1788/kernel/up_userspace.c b/configs/open1788/kernel/up_userspace.c
index 29864ae1060..a003fae3a6b 100644
--- a/configs/open1788/kernel/up_userspace.c
+++ b/configs/open1788/kernel/up_userspace.c
@@ -130,7 +130,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
 
   /* User-space work queue support (declared in include/nuttx/wqueue.h) */
 
-#ifdef CONFIG_SCHED_USRWORK
+#ifdef CONFIG_LIB_USRWORK
   .work_usrstart    = work_usrstart,
 #endif
 };
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index 9776666fdf9..262eb279303 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -594,7 +594,7 @@ CONFIG_SCHED_WORKPRIORITY=192
 CONFIG_SCHED_WORKPERIOD=50000
 CONFIG_SCHED_WORKSTACKSIZE=2048
 # CONFIG_SCHED_LPWORK is not set
-# CONFIG_SCHED_USRWORK is not set
+# CONFIG_LIB_USRWORK is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/sam3u-ek/kernel/up_userspace.c b/configs/sam3u-ek/kernel/up_userspace.c
index c9e07a1b031..db65b58e1a4 100644
--- a/configs/sam3u-ek/kernel/up_userspace.c
+++ b/configs/sam3u-ek/kernel/up_userspace.c
@@ -130,7 +130,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
 
   /* User-space work queue support (declared in include/nuttx/wqueue.h) */
 
-#ifdef CONFIG_SCHED_USRWORK
+#ifdef CONFIG_LIB_USRWORK
   .work_usrstart    = work_usrstart,
 #endif
 };
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index 754e103b124..4d58e15b40c 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -600,7 +600,7 @@ CONFIG_SCHED_WORKPRIORITY=192
 CONFIG_SCHED_WORKPERIOD=50000
 CONFIG_SCHED_WORKSTACKSIZE=1024
 # CONFIG_SCHED_LPWORK is not set
-# CONFIG_SCHED_USRWORK is not set
+# CONFIG_LIB_USRWORK is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm3240g-eval/kernel/up_userspace.c b/configs/stm3240g-eval/kernel/up_userspace.c
index 8a68a70e20c..4d7b8e225a8 100644
--- a/configs/stm3240g-eval/kernel/up_userspace.c
+++ b/configs/stm3240g-eval/kernel/up_userspace.c
@@ -130,7 +130,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
 
   /* User-space work queue support (declared in include/nuttx/wqueue.h) */
 
-#ifdef CONFIG_SCHED_USRWORK
+#ifdef CONFIG_LIB_USRWORK
   .work_usrstart    = work_usrstart,
 #endif
 };
diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig
index a52f645ccf5..546fe334d34 100644
--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@@ -870,7 +870,7 @@ CONFIG_SCHED_WORKSTACKSIZE=2048
 CONFIG_SCHED_LPWORKPRIORITY=50
 CONFIG_SCHED_LPWORKPERIOD=50000
 CONFIG_SCHED_LPWORKSTACKSIZE=2048
-CONFIG_SCHED_USRWORK=y
+CONFIG_LIB_USRWORK=y
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm32f4discovery/kernel/up_userspace.c b/configs/stm32f4discovery/kernel/up_userspace.c
index 0c5d7548df9..47d3d83279d 100644
--- a/configs/stm32f4discovery/kernel/up_userspace.c
+++ b/configs/stm32f4discovery/kernel/up_userspace.c
@@ -131,7 +131,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
 
   /* User-space work queue support (declared in include/nuttx/wqueue.h) */
 
-#ifdef CONFIG_SCHED_USRWORK
+#ifdef CONFIG_LIB_USRWORK
   .work_usrstart    = work_usrstart,
 #endif
 };