diff --git a/Documentation/NuttxUserGuide.html b/Documentation/NuttxUserGuide.html
index 2a1109cdb7..1fc401217f 100644
--- a/Documentation/NuttxUserGuide.html
+++ b/Documentation/NuttxUserGuide.html
@@ -7037,7 +7037,7 @@ interface of the same name.
#include <pthread.h>
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type);
#endif
@@ -7072,7 +7072,7 @@ returned to indicate the error:
#include <pthread.h>
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type);
#endif
diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index b41d96a19d..385592ef19 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -392,7 +392,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index 0536c98a8e..a7e210c221 100644
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -242,7 +242,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index 1d47dd30b7..dfdd5a037d 100644
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -242,7 +242,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/bambino-200e/netnsh/defconfig b/configs/bambino-200e/netnsh/defconfig
index 55267ea9e9..d23e6e4685 100644
--- a/configs/bambino-200e/netnsh/defconfig
+++ b/configs/bambino-200e/netnsh/defconfig
@@ -400,7 +400,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/bambino-200e/nsh/defconfig b/configs/bambino-200e/nsh/defconfig
index 4f62a210c2..61a12d8769 100644
--- a/configs/bambino-200e/nsh/defconfig
+++ b/configs/bambino-200e/nsh/defconfig
@@ -385,7 +385,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/bambino-200e/usbnsh/defconfig b/configs/bambino-200e/usbnsh/defconfig
index 46a155e47e..c6047a9771 100644
--- a/configs/bambino-200e/usbnsh/defconfig
+++ b/configs/bambino-200e/usbnsh/defconfig
@@ -385,7 +385,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig
index 35ccf58008..6014c6ffda 100644
--- a/configs/c5471evm/httpd/defconfig
+++ b/configs/c5471evm/httpd/defconfig
@@ -288,7 +288,7 @@ CONFIG_MAX_TASKS=64
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig
index fce9fd4940..e0cf04b541 100644
--- a/configs/c5471evm/nsh/defconfig
+++ b/configs/c5471evm/nsh/defconfig
@@ -288,7 +288,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/cc3200-launchpad/nsh/defconfig b/configs/cc3200-launchpad/nsh/defconfig
index 2be216cfef..27e88311f6 100644
--- a/configs/cc3200-launchpad/nsh/defconfig
+++ b/configs/cc3200-launchpad/nsh/defconfig
@@ -351,7 +351,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/clicker2-stm32/nsh/defconfig b/configs/clicker2-stm32/nsh/defconfig
index d13af3965b..355a7217d1 100644
--- a/configs/clicker2-stm32/nsh/defconfig
+++ b/configs/clicker2-stm32/nsh/defconfig
@@ -651,7 +651,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/clicker2-stm32/usbnsh/defconfig b/configs/clicker2-stm32/usbnsh/defconfig
index 32bf16050c..fda0234f36 100644
--- a/configs/clicker2-stm32/usbnsh/defconfig
+++ b/configs/clicker2-stm32/usbnsh/defconfig
@@ -652,7 +652,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index 0f138988ec..e39a9ca326 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -661,7 +661,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/dk-tm4c129x/ipv6/defconfig b/configs/dk-tm4c129x/ipv6/defconfig
index 328b1ffd43..8cb7e11ce0 100644
--- a/configs/dk-tm4c129x/ipv6/defconfig
+++ b/configs/dk-tm4c129x/ipv6/defconfig
@@ -418,7 +418,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/dk-tm4c129x/nsh/defconfig b/configs/dk-tm4c129x/nsh/defconfig
index 1032d72580..fed79d510e 100644
--- a/configs/dk-tm4c129x/nsh/defconfig
+++ b/configs/dk-tm4c129x/nsh/defconfig
@@ -418,7 +418,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 06faf8210d..bcffd2bb37 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -311,7 +311,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 205056e5c2..737846f7cf 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -331,7 +331,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index 16133499cc..b3e3461856 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -320,7 +320,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig
index 765553c8ed..3703c51789 100644
--- a/configs/ea3152/ostest/defconfig
+++ b/configs/ea3152/ostest/defconfig
@@ -307,7 +307,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index a1685a22e9..6b21f72a9f 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -392,7 +392,7 @@ CONFIG_MAX_TASKS=8
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index 5c9b615143..c7c0b278c5 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -397,7 +397,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 6b1e90c7c9..17496d0a84 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -377,7 +377,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/efm32-g8xx-stk/nsh/defconfig b/configs/efm32-g8xx-stk/nsh/defconfig
index 7d27d8a477..2b7cf9f9f8 100644
--- a/configs/efm32-g8xx-stk/nsh/defconfig
+++ b/configs/efm32-g8xx-stk/nsh/defconfig
@@ -342,7 +342,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/efm32gg-stk3700/nsh/defconfig b/configs/efm32gg-stk3700/nsh/defconfig
index b52a063e1c..ea429d6a69 100644
--- a/configs/efm32gg-stk3700/nsh/defconfig
+++ b/configs/efm32gg-stk3700/nsh/defconfig
@@ -342,7 +342,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index 970a1bd97a..5439a38cfb 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -384,7 +384,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/esp32-core/nsh/defconfig b/configs/esp32-core/nsh/defconfig
index b8b3ee020b..d1e291a106 100644
--- a/configs/esp32-core/nsh/defconfig
+++ b/configs/esp32-core/nsh/defconfig
@@ -224,7 +224,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/esp32-core/ostest/defconfig b/configs/esp32-core/ostest/defconfig
index ab632aa629..4e49924f66 100644
--- a/configs/esp32-core/ostest/defconfig
+++ b/configs/esp32-core/ostest/defconfig
@@ -224,7 +224,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/esp32-core/smp/defconfig b/configs/esp32-core/smp/defconfig
index cf95808659..90a3da7f79 100644
--- a/configs/esp32-core/smp/defconfig
+++ b/configs/esp32-core/smp/defconfig
@@ -226,7 +226,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index 9627243581..a969e62d1f 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -273,7 +273,7 @@ CONFIG_MAX_TASKS=8
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index 8fc46b9b99..e06e4044e6 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -273,7 +273,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index 4fbc368263..6f8033a9e4 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -273,7 +273,7 @@ CONFIG_MAX_TASKS=8
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index a7ec020931..3f877e06ca 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -670,7 +670,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/freedom-k64f/netnsh/defconfig b/configs/freedom-k64f/netnsh/defconfig
index c94d75f438..6bcc276b71 100644
--- a/configs/freedom-k64f/netnsh/defconfig
+++ b/configs/freedom-k64f/netnsh/defconfig
@@ -413,7 +413,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/freedom-k64f/nsh/defconfig b/configs/freedom-k64f/nsh/defconfig
index 83424e7838..bfbb82d082 100644
--- a/configs/freedom-k64f/nsh/defconfig
+++ b/configs/freedom-k64f/nsh/defconfig
@@ -408,7 +408,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/freedom-k66f/netnsh/defconfig b/configs/freedom-k66f/netnsh/defconfig
index 67c13b3089..e1b82e0fa0 100644
--- a/configs/freedom-k66f/netnsh/defconfig
+++ b/configs/freedom-k66f/netnsh/defconfig
@@ -414,7 +414,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/freedom-k66f/nsh/defconfig b/configs/freedom-k66f/nsh/defconfig
index 9605b84c9d..b6d2efa7f7 100644
--- a/configs/freedom-k66f/nsh/defconfig
+++ b/configs/freedom-k66f/nsh/defconfig
@@ -420,7 +420,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig
index 0061583e6f..84daa61608 100644
--- a/configs/freedom-kl25z/nsh/defconfig
+++ b/configs/freedom-kl25z/nsh/defconfig
@@ -319,7 +319,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/freedom-kl26z/nsh/defconfig b/configs/freedom-kl26z/nsh/defconfig
index f54ed0d572..ba03c3d453 100644
--- a/configs/freedom-kl26z/nsh/defconfig
+++ b/configs/freedom-kl26z/nsh/defconfig
@@ -319,7 +319,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index 0a91779a14..1cfd9aae24 100644
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -627,7 +627,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index fa837c2327..7d534b9ca1 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -646,7 +646,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig
index d80cc63e6f..93b6e551bd 100644
--- a/configs/hymini-stm32v/usbmsc/defconfig
+++ b/configs/hymini-stm32v/usbmsc/defconfig
@@ -633,7 +633,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig
index dc1652e6bd..934d297d66 100644
--- a/configs/hymini-stm32v/usbnsh/defconfig
+++ b/configs/hymini-stm32v/usbnsh/defconfig
@@ -620,7 +620,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig
index e1c0a80dc3..26e7fc63f2 100644
--- a/configs/hymini-stm32v/usbserial/defconfig
+++ b/configs/hymini-stm32v/usbserial/defconfig
@@ -624,7 +624,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig
index 874390fb7a..a4f8844e57 100644
--- a/configs/kwikstik-k40/ostest/defconfig
+++ b/configs/kwikstik-k40/ostest/defconfig
@@ -380,7 +380,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/launchxl-tms57004/nsh/defconfig b/configs/launchxl-tms57004/nsh/defconfig
index c13d511f8a..c0ec78af86 100644
--- a/configs/launchxl-tms57004/nsh/defconfig
+++ b/configs/launchxl-tms57004/nsh/defconfig
@@ -309,7 +309,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lincoln60/netnsh/defconfig b/configs/lincoln60/netnsh/defconfig
index 06961522e4..5f1c7134d2 100644
--- a/configs/lincoln60/netnsh/defconfig
+++ b/configs/lincoln60/netnsh/defconfig
@@ -375,7 +375,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig
index a7f5e64b13..9a031ae641 100644
--- a/configs/lincoln60/nsh/defconfig
+++ b/configs/lincoln60/nsh/defconfig
@@ -353,7 +353,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index e258aec958..0f700344cf 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -379,7 +379,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index bdf565b3a6..8921e6a294 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -389,7 +389,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index bdf565b3a6..8921e6a294 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -389,7 +389,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index 4a54e8007f..5ca268e751 100644
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -374,7 +374,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lm3s6965-ek/tcpecho/defconfig b/configs/lm3s6965-ek/tcpecho/defconfig
index 2efa710813..f790652e65 100644
--- a/configs/lm3s6965-ek/tcpecho/defconfig
+++ b/configs/lm3s6965-ek/tcpecho/defconfig
@@ -378,7 +378,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index 58a8f095ca..479e2b826f 100644
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -401,7 +401,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index 8c343bd1c6..bc2a3da9a6 100644
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -386,7 +386,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index 6f02848283..330e7b0e64 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -383,7 +383,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig
index 89bc4fa73a..958f82ea84 100644
--- a/configs/lpc4330-xplorer/nsh/defconfig
+++ b/configs/lpc4330-xplorer/nsh/defconfig
@@ -386,7 +386,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lpc4337-ws/nsh/defconfig b/configs/lpc4337-ws/nsh/defconfig
index 067cffc7ee..902865fca2 100644
--- a/configs/lpc4337-ws/nsh/defconfig
+++ b/configs/lpc4337-ws/nsh/defconfig
@@ -391,7 +391,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lpc4357-evb/nsh/defconfig b/configs/lpc4357-evb/nsh/defconfig
index bd1bcc04c5..c02e95b9ad 100644
--- a/configs/lpc4357-evb/nsh/defconfig
+++ b/configs/lpc4357-evb/nsh/defconfig
@@ -377,7 +377,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lpc4370-link2/nsh/defconfig b/configs/lpc4370-link2/nsh/defconfig
index 9a8ae1315d..e6dd94324c 100644
--- a/configs/lpc4370-link2/nsh/defconfig
+++ b/configs/lpc4370-link2/nsh/defconfig
@@ -387,7 +387,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lpcxpresso-lpc1115/nsh/defconfig b/configs/lpcxpresso-lpc1115/nsh/defconfig
index d38217dc0a..1aac33b678 100644
--- a/configs/lpcxpresso-lpc1115/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1115/nsh/defconfig
@@ -291,7 +291,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index 981c237dc0..aebe91afd8 100644
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -365,7 +365,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index f8991bb731..41f8e7270d 100644
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -353,7 +353,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
index 4258e43386..bb8b759084 100644
--- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
@@ -365,7 +365,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig
index d5707caf97..5a9f920921 100644
--- a/configs/maple/nsh/defconfig
+++ b/configs/maple/nsh/defconfig
@@ -608,7 +608,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig
index 4badf8cce0..7a3e615430 100644
--- a/configs/maple/nx/defconfig
+++ b/configs/maple/nx/defconfig
@@ -639,7 +639,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig
index 4b61b62be7..b74195b592 100644
--- a/configs/maple/usbnsh/defconfig
+++ b/configs/maple/usbnsh/defconfig
@@ -614,7 +614,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index 91040faa58..8a252652ba 100644
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -354,7 +354,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig
index 1867544145..e332f48619 100644
--- a/configs/mcu123-lpc214x/composite/defconfig
+++ b/configs/mcu123-lpc214x/composite/defconfig
@@ -302,7 +302,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 602812eff3..b9af89a29b 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -292,7 +292,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig
index 46e3629c62..8835809819 100644
--- a/configs/mcu123-lpc214x/usbmsc/defconfig
+++ b/configs/mcu123-lpc214x/usbmsc/defconfig
@@ -302,7 +302,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index cbfecf5e66..fd0b0a3db1 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -301,7 +301,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index c41315b980..012a6452e3 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -669,7 +669,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index 627f3da390..28e61f6c2d 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -671,7 +671,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig
index 8389737436..fa6618f860 100644
--- a/configs/mikroe-stm32f4/nsh/defconfig
+++ b/configs/mikroe-stm32f4/nsh/defconfig
@@ -647,7 +647,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig
index 397c14892e..ddfed5178c 100644
--- a/configs/mikroe-stm32f4/nx/defconfig
+++ b/configs/mikroe-stm32f4/nx/defconfig
@@ -620,7 +620,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig
index 9c806f8868..3d4824dece 100644
--- a/configs/mikroe-stm32f4/nxlines/defconfig
+++ b/configs/mikroe-stm32f4/nxlines/defconfig
@@ -620,7 +620,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig
index ae61dcf829..9436d9681c 100644
--- a/configs/mikroe-stm32f4/nxtext/defconfig
+++ b/configs/mikroe-stm32f4/nxtext/defconfig
@@ -620,7 +620,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index 3a15a1f7df..86407369f4 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -655,7 +655,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index 287646a85d..1a2ba210f0 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -383,7 +383,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/misoc/hello/defconfig b/configs/misoc/hello/defconfig
index bcd0724148..a0a54eceef 100644
--- a/configs/misoc/hello/defconfig
+++ b/configs/misoc/hello/defconfig
@@ -236,7 +236,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/moxa/nsh/defconfig b/configs/moxa/nsh/defconfig
index 5d8bf233e3..f697f4e4fc 100644
--- a/configs/moxa/nsh/defconfig
+++ b/configs/moxa/nsh/defconfig
@@ -268,7 +268,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index 4885086e8e..351c5d15ef 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -273,7 +273,7 @@ CONFIG_MAX_TASKS=64
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nr5m100-nexys4/nsh/defconfig b/configs/nr5m100-nexys4/nsh/defconfig
index cd3d16c67b..9ad1b3ba9d 100644
--- a/configs/nr5m100-nexys4/nsh/defconfig
+++ b/configs/nr5m100-nexys4/nsh/defconfig
@@ -230,7 +230,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index 12651fcce7..cb775f31a8 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -270,7 +270,7 @@ CONFIG_MAX_TASKS=64
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index d7c104d42e..aa8de3c0be 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -270,7 +270,7 @@ CONFIG_MAX_TASKS=64
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/ntosd-dm320/webserver/defconfig b/configs/ntosd-dm320/webserver/defconfig
index 1e5e452ceb..d2320bf672 100644
--- a/configs/ntosd-dm320/webserver/defconfig
+++ b/configs/ntosd-dm320/webserver/defconfig
@@ -270,7 +270,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-144/f746-evalos/defconfig b/configs/nucleo-144/f746-evalos/defconfig
index 98e5af1216..5603a1aaa2 100644
--- a/configs/nucleo-144/f746-evalos/defconfig
+++ b/configs/nucleo-144/f746-evalos/defconfig
@@ -489,7 +489,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-144/f746-nsh/defconfig b/configs/nucleo-144/f746-nsh/defconfig
index cabf00e30b..1a362372b1 100644
--- a/configs/nucleo-144/f746-nsh/defconfig
+++ b/configs/nucleo-144/f746-nsh/defconfig
@@ -489,7 +489,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-144/f767-evalos/defconfig b/configs/nucleo-144/f767-evalos/defconfig
index e2965f6489..57a3aeeed0 100644
--- a/configs/nucleo-144/f767-evalos/defconfig
+++ b/configs/nucleo-144/f767-evalos/defconfig
@@ -493,7 +493,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-144/f767-nsh/defconfig b/configs/nucleo-144/f767-nsh/defconfig
index e638ac71ec..c061f7f9b0 100644
--- a/configs/nucleo-144/f767-nsh/defconfig
+++ b/configs/nucleo-144/f767-nsh/defconfig
@@ -493,7 +493,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-f303re/adc/defconfig b/configs/nucleo-f303re/adc/defconfig
index 74668a9f05..1a8f828845 100644
--- a/configs/nucleo-f303re/adc/defconfig
+++ b/configs/nucleo-f303re/adc/defconfig
@@ -609,7 +609,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-f303re/can/defconfig b/configs/nucleo-f303re/can/defconfig
index f251bc9065..84d8e54188 100644
--- a/configs/nucleo-f303re/can/defconfig
+++ b/configs/nucleo-f303re/can/defconfig
@@ -612,7 +612,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-f303re/hello/defconfig b/configs/nucleo-f303re/hello/defconfig
index 42c6bc187b..80f265905f 100644
--- a/configs/nucleo-f303re/hello/defconfig
+++ b/configs/nucleo-f303re/hello/defconfig
@@ -619,7 +619,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-f303re/nxlines/defconfig b/configs/nucleo-f303re/nxlines/defconfig
index 9e7986d922..0082d94fcb 100644
--- a/configs/nucleo-f303re/nxlines/defconfig
+++ b/configs/nucleo-f303re/nxlines/defconfig
@@ -611,7 +611,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-f303re/pwm/defconfig b/configs/nucleo-f303re/pwm/defconfig
index c91563199f..efddd49b67 100644
--- a/configs/nucleo-f303re/pwm/defconfig
+++ b/configs/nucleo-f303re/pwm/defconfig
@@ -613,7 +613,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-f303re/serialrx/defconfig b/configs/nucleo-f303re/serialrx/defconfig
index 20333da3a5..88407d7671 100644
--- a/configs/nucleo-f303re/serialrx/defconfig
+++ b/configs/nucleo-f303re/serialrx/defconfig
@@ -624,7 +624,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-f303re/uavcan/defconfig b/configs/nucleo-f303re/uavcan/defconfig
index 9918c00815..2546b67d90 100644
--- a/configs/nucleo-f303re/uavcan/defconfig
+++ b/configs/nucleo-f303re/uavcan/defconfig
@@ -597,7 +597,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-f4x1re/f401-nsh/defconfig b/configs/nucleo-f4x1re/f401-nsh/defconfig
index 5783b024fc..9b043a844f 100644
--- a/configs/nucleo-f4x1re/f401-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f401-nsh/defconfig
@@ -616,7 +616,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-f4x1re/f411-nsh/defconfig b/configs/nucleo-f4x1re/f411-nsh/defconfig
index ce765110b7..b289f3270d 100644
--- a/configs/nucleo-f4x1re/f411-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f411-nsh/defconfig
@@ -618,7 +618,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nucleo-l476rg/nsh/defconfig b/configs/nucleo-l476rg/nsh/defconfig
index e851d0a797..3f842a38cc 100644
--- a/configs/nucleo-l476rg/nsh/defconfig
+++ b/configs/nucleo-l476rg/nsh/defconfig
@@ -441,7 +441,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/nutiny-nuc120/nsh/defconfig b/configs/nutiny-nuc120/nsh/defconfig
index bf3c57c9f7..bb97150c70 100644
--- a/configs/nutiny-nuc120/nsh/defconfig
+++ b/configs/nutiny-nuc120/nsh/defconfig
@@ -343,7 +343,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-efm32g880f128-stk/nsh/defconfig b/configs/olimex-efm32g880f128-stk/nsh/defconfig
index f9fab939a7..4013087ecb 100644
--- a/configs/olimex-efm32g880f128-stk/nsh/defconfig
+++ b/configs/olimex-efm32g880f128-stk/nsh/defconfig
@@ -336,7 +336,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-lpc-h3131/nsh/defconfig b/configs/olimex-lpc-h3131/nsh/defconfig
index cb4e8d9305..a78090e013 100644
--- a/configs/olimex-lpc-h3131/nsh/defconfig
+++ b/configs/olimex-lpc-h3131/nsh/defconfig
@@ -309,7 +309,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig
index 7a855b94ca..44db4095a1 100644
--- a/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -365,7 +365,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-lpc1766stk/hidmouse/defconfig b/configs/olimex-lpc1766stk/hidmouse/defconfig
index 13a8958338..b278edfb1f 100644
--- a/configs/olimex-lpc1766stk/hidmouse/defconfig
+++ b/configs/olimex-lpc1766stk/hidmouse/defconfig
@@ -379,7 +379,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 74c28f8946..2c8cf3c744 100644
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -366,7 +366,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index c2aa80529b..bf4822c38c 100644
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -364,7 +364,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig
index 75a87a0898..22e5d46346 100644
--- a/configs/olimex-lpc1766stk/usbmsc/defconfig
+++ b/configs/olimex-lpc1766stk/usbmsc/defconfig
@@ -366,7 +366,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index e84ff2871b..c018b34898 100644
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -366,7 +366,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig
index f110982d33..706bf399a5 100644
--- a/configs/olimex-lpc1766stk/zmodem/defconfig
+++ b/configs/olimex-lpc1766stk/zmodem/defconfig
@@ -367,7 +367,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index 6c82afc55a..107dc433f2 100644
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -279,7 +279,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-stm32-e407/discover/defconfig b/configs/olimex-stm32-e407/discover/defconfig
index b3a6708d1c..45fe31dd49 100644
--- a/configs/olimex-stm32-e407/discover/defconfig
+++ b/configs/olimex-stm32-e407/discover/defconfig
@@ -664,7 +664,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-stm32-e407/netnsh/defconfig b/configs/olimex-stm32-e407/netnsh/defconfig
index db9b5c84d9..34db63f2e4 100644
--- a/configs/olimex-stm32-e407/netnsh/defconfig
+++ b/configs/olimex-stm32-e407/netnsh/defconfig
@@ -664,7 +664,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-stm32-e407/nsh/defconfig b/configs/olimex-stm32-e407/nsh/defconfig
index c5b7cc6458..a1cd1d5db7 100644
--- a/configs/olimex-stm32-e407/nsh/defconfig
+++ b/configs/olimex-stm32-e407/nsh/defconfig
@@ -642,7 +642,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-stm32-e407/telnetd/defconfig b/configs/olimex-stm32-e407/telnetd/defconfig
index 003bbb2905..ab40706675 100644
--- a/configs/olimex-stm32-e407/telnetd/defconfig
+++ b/configs/olimex-stm32-e407/telnetd/defconfig
@@ -664,7 +664,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-stm32-e407/usbnsh/defconfig b/configs/olimex-stm32-e407/usbnsh/defconfig
index e2079db38b..73b5b0f45a 100644
--- a/configs/olimex-stm32-e407/usbnsh/defconfig
+++ b/configs/olimex-stm32-e407/usbnsh/defconfig
@@ -648,7 +648,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-stm32-e407/webserver/defconfig b/configs/olimex-stm32-e407/webserver/defconfig
index 4f369f8f8e..a20352448f 100644
--- a/configs/olimex-stm32-e407/webserver/defconfig
+++ b/configs/olimex-stm32-e407/webserver/defconfig
@@ -664,7 +664,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-stm32-h405/usbnsh/defconfig b/configs/olimex-stm32-h405/usbnsh/defconfig
index 9037e4139f..e0079fda92 100644
--- a/configs/olimex-stm32-h405/usbnsh/defconfig
+++ b/configs/olimex-stm32-h405/usbnsh/defconfig
@@ -666,7 +666,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-stm32-h407/nsh/defconfig b/configs/olimex-stm32-h407/nsh/defconfig
index 33847bcca9..fc5a113c74 100644
--- a/configs/olimex-stm32-h407/nsh/defconfig
+++ b/configs/olimex-stm32-h407/nsh/defconfig
@@ -642,7 +642,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index 430a2f84d7..3a77537c5c 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -631,7 +631,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig
index b4454d3756..a9b0e19e10 100644
--- a/configs/olimex-stm32-p207/nsh/defconfig
+++ b/configs/olimex-stm32-p207/nsh/defconfig
@@ -692,7 +692,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-stm32-p407/knsh/defconfig b/configs/olimex-stm32-p407/knsh/defconfig
index 51699bf7d8..c1a5cb58bf 100644
--- a/configs/olimex-stm32-p407/knsh/defconfig
+++ b/configs/olimex-stm32-p407/knsh/defconfig
@@ -654,7 +654,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-stm32-p407/nsh/defconfig b/configs/olimex-stm32-p407/nsh/defconfig
index f7fcfb08e2..bbf8b95d54 100644
--- a/configs/olimex-stm32-p407/nsh/defconfig
+++ b/configs/olimex-stm32-p407/nsh/defconfig
@@ -658,7 +658,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index 45b867aaad..6bde1e1f3b 100644
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -298,7 +298,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index 6056494510..6a46e966b6 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -302,7 +302,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimexino-stm32/can/defconfig b/configs/olimexino-stm32/can/defconfig
index 6a256641ce..25eaf0aefc 100644
--- a/configs/olimexino-stm32/can/defconfig
+++ b/configs/olimexino-stm32/can/defconfig
@@ -658,7 +658,7 @@ CONFIG_MAX_TASKS=12
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig
index 05c32536ed..8eb861aff4 100644
--- a/configs/olimexino-stm32/composite/defconfig
+++ b/configs/olimexino-stm32/composite/defconfig
@@ -658,7 +658,7 @@ CONFIG_MAX_TASKS=12
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimexino-stm32/nsh/defconfig b/configs/olimexino-stm32/nsh/defconfig
index ec8a8eccd8..7fb0682188 100644
--- a/configs/olimexino-stm32/nsh/defconfig
+++ b/configs/olimexino-stm32/nsh/defconfig
@@ -657,7 +657,7 @@ CONFIG_MAX_TASKS=12
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimexino-stm32/smallnsh/defconfig b/configs/olimexino-stm32/smallnsh/defconfig
index fd15121169..fc5194b8ec 100644
--- a/configs/olimexino-stm32/smallnsh/defconfig
+++ b/configs/olimexino-stm32/smallnsh/defconfig
@@ -639,7 +639,7 @@ CONFIG_MAX_TASKS=4
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/olimexino-stm32/tiny/defconfig b/configs/olimexino-stm32/tiny/defconfig
index 3623a1cdba..9991232442 100644
--- a/configs/olimexino-stm32/tiny/defconfig
+++ b/configs/olimexino-stm32/tiny/defconfig
@@ -639,7 +639,7 @@ CONFIG_MAX_TASKS=4
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index d34c2b7ff8..f539625c3c 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -366,7 +366,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig
index aec3804257..d8fc7e13fb 100644
--- a/configs/open1788/nsh/defconfig
+++ b/configs/open1788/nsh/defconfig
@@ -364,7 +364,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig
index beda60dd82..c95b7d51f4 100644
--- a/configs/open1788/nxlines/defconfig
+++ b/configs/open1788/nxlines/defconfig
@@ -398,7 +398,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/p112/ostest/defconfig b/configs/p112/ostest/defconfig
index a7fc5e7748..247254f1c6 100644
--- a/configs/p112/ostest/defconfig
+++ b/configs/p112/ostest/defconfig
@@ -206,7 +206,7 @@ CONFIG_START_YEAR=2007
CONFIG_START_MONTH=2
CONFIG_START_DAY=21
# CONFIG_DEV_CONSOLE is not set
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
# CONFIG_PRIORITY_INHERITANCE is not set
# CONFIG_FDCLONE_DISABLE is not set
# CONFIG_FDCLONE_STDIO is not set
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index d8c64680a6..015492f3c3 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -380,7 +380,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/pcduino-a10/nsh/defconfig b/configs/pcduino-a10/nsh/defconfig
index f181819f2d..653a69aad8 100644
--- a/configs/pcduino-a10/nsh/defconfig
+++ b/configs/pcduino-a10/nsh/defconfig
@@ -367,7 +367,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/photon/nsh/defconfig b/configs/photon/nsh/defconfig
index 9e808a75f3..0072a232eb 100644
--- a/configs/photon/nsh/defconfig
+++ b/configs/photon/nsh/defconfig
@@ -636,7 +636,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/photon/usbnsh/defconfig b/configs/photon/usbnsh/defconfig
index c6326b54df..251914b079 100644
--- a/configs/photon/usbnsh/defconfig
+++ b/configs/photon/usbnsh/defconfig
@@ -637,7 +637,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/pic32mx-starterkit/nsh/defconfig b/configs/pic32mx-starterkit/nsh/defconfig
index 6046b8b420..f89384e555 100644
--- a/configs/pic32mx-starterkit/nsh/defconfig
+++ b/configs/pic32mx-starterkit/nsh/defconfig
@@ -386,7 +386,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/pic32mx-starterkit/nsh2/defconfig b/configs/pic32mx-starterkit/nsh2/defconfig
index c437b0d314..a8b36d84ce 100644
--- a/configs/pic32mx-starterkit/nsh2/defconfig
+++ b/configs/pic32mx-starterkit/nsh2/defconfig
@@ -397,7 +397,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index 5b0c7bb0e4..9b7faf1af7 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -406,7 +406,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/pic32mz-starterkit/nsh/defconfig b/configs/pic32mz-starterkit/nsh/defconfig
index 6122f7b9e8..5090e2d447 100644
--- a/configs/pic32mz-starterkit/nsh/defconfig
+++ b/configs/pic32mz-starterkit/nsh/defconfig
@@ -313,7 +313,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index 33163950fa..4be4465d1a 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -206,7 +206,7 @@ CONFIG_MAX_TASKS=64
#
# Pthread Options
#
-CONFIG_MUTEX_TYPES=y
+CONFIG_PTHREAD_MUTEX_TYPES=y
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig
index 2aa95a3aa8..6a1b80f37f 100644
--- a/configs/qemu-i486/ostest/defconfig
+++ b/configs/qemu-i486/ostest/defconfig
@@ -206,7 +206,7 @@ CONFIG_MAX_TASKS=64
#
# Pthread Options
#
-CONFIG_MUTEX_TYPES=y
+CONFIG_PTHREAD_MUTEX_TYPES=y
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sabre-6quad/nsh/defconfig b/configs/sabre-6quad/nsh/defconfig
index 015d44dc6d..dfa9dc689f 100644
--- a/configs/sabre-6quad/nsh/defconfig
+++ b/configs/sabre-6quad/nsh/defconfig
@@ -322,7 +322,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sabre-6quad/smp/defconfig b/configs/sabre-6quad/smp/defconfig
index a2544273b9..21569e99cb 100644
--- a/configs/sabre-6quad/smp/defconfig
+++ b/configs/sabre-6quad/smp/defconfig
@@ -327,7 +327,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index 6af0730c6c..fa70b85b3c 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -389,7 +389,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 0925cb868d..4f3af6a72a 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -388,7 +388,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index 36987fc43b..7150bd5790 100644
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -383,7 +383,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index 32a587d239..cbb1614bab 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -395,7 +395,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sam4cmp-db/nsh/defconfig b/configs/sam4cmp-db/nsh/defconfig
index 0fa5131213..5790893479 100644
--- a/configs/sam4cmp-db/nsh/defconfig
+++ b/configs/sam4cmp-db/nsh/defconfig
@@ -400,7 +400,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig
index e1c0a93e79..11cea1f028 100644
--- a/configs/sam4e-ek/nsh/defconfig
+++ b/configs/sam4e-ek/nsh/defconfig
@@ -433,7 +433,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sam4e-ek/nxwm/defconfig b/configs/sam4e-ek/nxwm/defconfig
index 1042d44996..27ee8c8d62 100644
--- a/configs/sam4e-ek/nxwm/defconfig
+++ b/configs/sam4e-ek/nxwm/defconfig
@@ -441,7 +441,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig
index 5164a20c33..a9a085da8d 100644
--- a/configs/sam4e-ek/usbnsh/defconfig
+++ b/configs/sam4e-ek/usbnsh/defconfig
@@ -439,7 +439,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig
index 05a66746b6..a814652926 100644
--- a/configs/sam4l-xplained/nsh/defconfig
+++ b/configs/sam4l-xplained/nsh/defconfig
@@ -406,7 +406,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index 4c976fd603..b652a1e88f 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -427,7 +427,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index 842ca37509..83ea926edb 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -386,7 +386,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig
index a8c89702f8..12fae8f490 100644
--- a/configs/sama5d2-xult/nsh/defconfig
+++ b/configs/sama5d2-xult/nsh/defconfig
@@ -462,7 +462,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d3-xplained/bridge/defconfig b/configs/sama5d3-xplained/bridge/defconfig
index 7d9d6b72be..a4492196c5 100644
--- a/configs/sama5d3-xplained/bridge/defconfig
+++ b/configs/sama5d3-xplained/bridge/defconfig
@@ -460,7 +460,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig
index 16fae22584..bc5af1a452 100644
--- a/configs/sama5d3-xplained/nsh/defconfig
+++ b/configs/sama5d3-xplained/nsh/defconfig
@@ -425,7 +425,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index e9bcf44a91..6192d4e394 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -488,7 +488,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig
index 87c1c7fdce..8c94fe0d4f 100644
--- a/configs/sama5d3x-ek/hello/defconfig
+++ b/configs/sama5d3x-ek/hello/defconfig
@@ -407,7 +407,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig
index 9d3b19e90d..a2cd0cd6ce 100644
--- a/configs/sama5d3x-ek/norboot/defconfig
+++ b/configs/sama5d3x-ek/norboot/defconfig
@@ -421,7 +421,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index a0aef06837..8db191b838 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -424,7 +424,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig
index 84a38dafe2..fe0bf5e3ad 100644
--- a/configs/sama5d3x-ek/nx/defconfig
+++ b/configs/sama5d3x-ek/nx/defconfig
@@ -466,7 +466,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig
index 206402ce0b..b90e25e494 100644
--- a/configs/sama5d3x-ek/nxplayer/defconfig
+++ b/configs/sama5d3x-ek/nxplayer/defconfig
@@ -485,7 +485,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index 3441a0c134..7626a2b947 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -500,7 +500,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig
index fb54648635..57fa4dda6e 100644
--- a/configs/sama5d3x-ek/ov2640/defconfig
+++ b/configs/sama5d3x-ek/ov2640/defconfig
@@ -472,7 +472,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig
index fbd3b3db80..c19493d204 100644
--- a/configs/sama5d4-ek/at25boot/defconfig
+++ b/configs/sama5d4-ek/at25boot/defconfig
@@ -450,7 +450,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d4-ek/bridge/defconfig b/configs/sama5d4-ek/bridge/defconfig
index 41e9f16108..85245101b0 100644
--- a/configs/sama5d4-ek/bridge/defconfig
+++ b/configs/sama5d4-ek/bridge/defconfig
@@ -478,7 +478,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d4-ek/dramboot/defconfig b/configs/sama5d4-ek/dramboot/defconfig
index dca1c2fd9b..1150a6609f 100644
--- a/configs/sama5d4-ek/dramboot/defconfig
+++ b/configs/sama5d4-ek/dramboot/defconfig
@@ -443,7 +443,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d4-ek/elf/defconfig b/configs/sama5d4-ek/elf/defconfig
index d6e280da0d..9632bcdff9 100644
--- a/configs/sama5d4-ek/elf/defconfig
+++ b/configs/sama5d4-ek/elf/defconfig
@@ -453,7 +453,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d4-ek/ipv6/defconfig b/configs/sama5d4-ek/ipv6/defconfig
index 71cfd5ca4b..b2e488e00f 100644
--- a/configs/sama5d4-ek/ipv6/defconfig
+++ b/configs/sama5d4-ek/ipv6/defconfig
@@ -577,7 +577,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d4-ek/knsh/defconfig b/configs/sama5d4-ek/knsh/defconfig
index f05ae86fbc..be1c9fd5b4 100644
--- a/configs/sama5d4-ek/knsh/defconfig
+++ b/configs/sama5d4-ek/knsh/defconfig
@@ -470,7 +470,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d4-ek/knsh/defconfig.ROMFS b/configs/sama5d4-ek/knsh/defconfig.ROMFS
index a7fd05ca58..191c970fff 100644
--- a/configs/sama5d4-ek/knsh/defconfig.ROMFS
+++ b/configs/sama5d4-ek/knsh/defconfig.ROMFS
@@ -381,7 +381,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
#
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index 37571f3a5a..820d434038 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -577,7 +577,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig
index a3086ea7d6..9f49ae3a7f 100644
--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@@ -549,7 +549,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig
index c2d98e526f..943e794b2d 100644
--- a/configs/sama5d4-ek/ramtest/defconfig
+++ b/configs/sama5d4-ek/ramtest/defconfig
@@ -442,7 +442,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig
index 307e424afd..accfc04cc2 100644
--- a/configs/samd20-xplained/nsh/defconfig
+++ b/configs/samd20-xplained/nsh/defconfig
@@ -369,7 +369,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/samd21-xplained/nsh/defconfig b/configs/samd21-xplained/nsh/defconfig
index 03026a8376..7d13c4909e 100644
--- a/configs/samd21-xplained/nsh/defconfig
+++ b/configs/samd21-xplained/nsh/defconfig
@@ -367,7 +367,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/same70-xplained/netnsh/defconfig b/configs/same70-xplained/netnsh/defconfig
index d472559ad8..7e0b322e2c 100644
--- a/configs/same70-xplained/netnsh/defconfig
+++ b/configs/same70-xplained/netnsh/defconfig
@@ -452,7 +452,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/same70-xplained/nsh/defconfig b/configs/same70-xplained/nsh/defconfig
index 80f1fbf9d2..95fc9237c7 100644
--- a/configs/same70-xplained/nsh/defconfig
+++ b/configs/same70-xplained/nsh/defconfig
@@ -437,7 +437,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig
index feb9aa82d4..44b619e305 100644
--- a/configs/saml21-xplained/nsh/defconfig
+++ b/configs/saml21-xplained/nsh/defconfig
@@ -355,7 +355,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/samv71-xult/knsh/defconfig b/configs/samv71-xult/knsh/defconfig
index ebbb97e10d..756d20cf7a 100644
--- a/configs/samv71-xult/knsh/defconfig
+++ b/configs/samv71-xult/knsh/defconfig
@@ -445,7 +445,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/samv71-xult/module/defconfig b/configs/samv71-xult/module/defconfig
index 414a1893b4..8f993004c8 100644
--- a/configs/samv71-xult/module/defconfig
+++ b/configs/samv71-xult/module/defconfig
@@ -420,7 +420,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/samv71-xult/mxtxplnd/defconfig b/configs/samv71-xult/mxtxplnd/defconfig
index be79a3cec8..562257bd95 100644
--- a/configs/samv71-xult/mxtxplnd/defconfig
+++ b/configs/samv71-xult/mxtxplnd/defconfig
@@ -438,7 +438,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/samv71-xult/netnsh/defconfig b/configs/samv71-xult/netnsh/defconfig
index a38656d9c1..7c5afb7acc 100644
--- a/configs/samv71-xult/netnsh/defconfig
+++ b/configs/samv71-xult/netnsh/defconfig
@@ -455,7 +455,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/samv71-xult/nsh/defconfig b/configs/samv71-xult/nsh/defconfig
index ce85bb673b..4f2ecda618 100644
--- a/configs/samv71-xult/nsh/defconfig
+++ b/configs/samv71-xult/nsh/defconfig
@@ -440,7 +440,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/samv71-xult/nxwm/defconfig b/configs/samv71-xult/nxwm/defconfig
index e5246ecafa..f50d5ff31f 100644
--- a/configs/samv71-xult/nxwm/defconfig
+++ b/configs/samv71-xult/nxwm/defconfig
@@ -439,7 +439,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/samv71-xult/vnc/defconfig b/configs/samv71-xult/vnc/defconfig
index 00e4ca6bca..1402ffb99d 100644
--- a/configs/samv71-xult/vnc/defconfig
+++ b/configs/samv71-xult/vnc/defconfig
@@ -454,7 +454,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/samv71-xult/vnxwm/defconfig b/configs/samv71-xult/vnxwm/defconfig
index 2606fbbcab..f7fef3296d 100644
--- a/configs/samv71-xult/vnxwm/defconfig
+++ b/configs/samv71-xult/vnxwm/defconfig
@@ -455,7 +455,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index 60caa4bafc..30c6547cff 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -651,7 +651,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index e82a839ed3..6306307a44 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -674,7 +674,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index b8feba27ea..6e40305a21 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -652,7 +652,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/bas/defconfig b/configs/sim/bas/defconfig
index a5aece53f1..04f89c514f 100644
--- a/configs/sim/bas/defconfig
+++ b/configs/sim/bas/defconfig
@@ -208,7 +208,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/cxxtest/defconfig b/configs/sim/cxxtest/defconfig
index 596267b579..7625148fcd 100644
--- a/configs/sim/cxxtest/defconfig
+++ b/configs/sim/cxxtest/defconfig
@@ -201,7 +201,7 @@ CONFIG_MAX_TASKS=64
#
# Pthread Options
#
-CONFIG_MUTEX_TYPES=y
+CONFIG_PTHREAD_MUTEX_TYPES=y
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/minibasic/defconfig b/configs/sim/minibasic/defconfig
index 84aa2c94b9..0e582ed3cd 100644
--- a/configs/sim/minibasic/defconfig
+++ b/configs/sim/minibasic/defconfig
@@ -235,7 +235,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index 5bae00f40b..c7a83e8908 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -201,7 +201,7 @@ CONFIG_MAX_TASKS=64
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/mtdrwb/defconfig b/configs/sim/mtdrwb/defconfig
index c7ea3c4825..0debd96feb 100644
--- a/configs/sim/mtdrwb/defconfig
+++ b/configs/sim/mtdrwb/defconfig
@@ -201,7 +201,7 @@ CONFIG_MAX_TASKS=64
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index 3209c63ae4..1e471fd063 100644
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -201,7 +201,7 @@ CONFIG_MAX_TASKS=64
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 683dc18657..ff4efbb0f0 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -208,7 +208,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig
index c9798d1df2..d6fd7c8e5b 100644
--- a/configs/sim/nsh2/defconfig
+++ b/configs/sim/nsh2/defconfig
@@ -216,7 +216,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 8450147a06..e9c94ef24d 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -205,7 +205,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig
index 54d0ba8c5d..1176121728 100644
--- a/configs/sim/nx11/defconfig
+++ b/configs/sim/nx11/defconfig
@@ -206,7 +206,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig
index a63927a3e3..fb547cc57f 100644
--- a/configs/sim/nxlines/defconfig
+++ b/configs/sim/nxlines/defconfig
@@ -216,7 +216,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig
index 254409eab3..2749e54197 100644
--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@@ -211,7 +211,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index be0f68fdce..b76f88dfd0 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -202,7 +202,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-CONFIG_MUTEX_TYPES=y
+CONFIG_PTHREAD_MUTEX_TYPES=y
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index 2f30e200bb..5c329f978b 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -201,7 +201,7 @@ CONFIG_MAX_TASKS=64
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig
index 5b1f3360d6..a8ad9b5f43 100644
--- a/configs/sim/touchscreen/defconfig
+++ b/configs/sim/touchscreen/defconfig
@@ -216,7 +216,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/traveler/defconfig b/configs/sim/traveler/defconfig
index 9711d23431..db68d953a9 100644
--- a/configs/sim/traveler/defconfig
+++ b/configs/sim/traveler/defconfig
@@ -209,7 +209,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/udgram/defconfig b/configs/sim/udgram/defconfig
index c92e6efaa9..aaf31194e1 100644
--- a/configs/sim/udgram/defconfig
+++ b/configs/sim/udgram/defconfig
@@ -208,7 +208,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/unionfs/defconfig b/configs/sim/unionfs/defconfig
index 513b70747b..27dc23dd88 100644
--- a/configs/sim/unionfs/defconfig
+++ b/configs/sim/unionfs/defconfig
@@ -208,7 +208,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sim/ustream/defconfig b/configs/sim/ustream/defconfig
index df0ab89e15..146cf9695f 100644
--- a/configs/sim/ustream/defconfig
+++ b/configs/sim/ustream/defconfig
@@ -208,7 +208,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index 0edccdc2b4..6869e4ca4c 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -196,7 +196,7 @@ CONFIG_MAX_TASKS=8
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig
index 2fc6bc1b43..4c53bfb69f 100644
--- a/configs/spark/composite/defconfig
+++ b/configs/spark/composite/defconfig
@@ -627,7 +627,7 @@ CONFIG_MAX_TASKS=12
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig
index 9a4ef0b4d4..2768858395 100644
--- a/configs/spark/nsh/defconfig
+++ b/configs/spark/nsh/defconfig
@@ -627,7 +627,7 @@ CONFIG_MAX_TASKS=12
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig
index 243b2b1d60..bf8b9101fc 100644
--- a/configs/spark/usbmsc/defconfig
+++ b/configs/spark/usbmsc/defconfig
@@ -627,7 +627,7 @@ CONFIG_MAX_TASKS=12
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/spark/usbnsh/defconfig b/configs/spark/usbnsh/defconfig
index a64a14e621..cb810ac38a 100644
--- a/configs/spark/usbnsh/defconfig
+++ b/configs/spark/usbnsh/defconfig
@@ -626,7 +626,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig
index c2014af213..6813801980 100644
--- a/configs/spark/usbserial/defconfig
+++ b/configs/spark/usbserial/defconfig
@@ -632,7 +632,7 @@ CONFIG_MAX_TASKS=12
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig
index 6cf922622e..c003251c1e 100644
--- a/configs/stm3210e-eval/composite/defconfig
+++ b/configs/stm3210e-eval/composite/defconfig
@@ -647,7 +647,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index ddcf4b9d73..45d83032ce 100644
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -648,7 +648,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index 5b690bc2a6..c30a1bc7d2 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -664,7 +664,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig
index bbb17b0c78..544b55c68c 100644
--- a/configs/stm3210e-eval/nx/defconfig
+++ b/configs/stm3210e-eval/nx/defconfig
@@ -651,7 +651,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3210e-eval/nxterm/defconfig b/configs/stm3210e-eval/nxterm/defconfig
index d749e44f36..bd9a3c6f9d 100644
--- a/configs/stm3210e-eval/nxterm/defconfig
+++ b/configs/stm3210e-eval/nxterm/defconfig
@@ -644,7 +644,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index b1156be57c..b8047456f1 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -664,7 +664,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig
index 925f75940b..60950a454f 100644
--- a/configs/stm3210e-eval/usbmsc/defconfig
+++ b/configs/stm3210e-eval/usbmsc/defconfig
@@ -638,7 +638,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index fc7bc98678..12f55502e5 100644
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -630,7 +630,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig
index a9fbdf2f6d..127c8723b5 100644
--- a/configs/stm3220g-eval/nsh/defconfig
+++ b/configs/stm3220g-eval/nsh/defconfig
@@ -670,7 +670,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig
index 0d0ae9af74..6e9bc14fa8 100644
--- a/configs/stm3220g-eval/nsh2/defconfig
+++ b/configs/stm3220g-eval/nsh2/defconfig
@@ -671,7 +671,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index 66c4046191..a339400d24 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -690,7 +690,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig
index 59971c43a9..8f58437cc3 100644
--- a/configs/stm3240g-eval/discover/defconfig
+++ b/configs/stm3240g-eval/discover/defconfig
@@ -669,7 +669,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig
index d7ed1665f3..e9b5edca2b 100644
--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@@ -684,7 +684,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index 6d23dd4164..c18a3e8462 100644
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -684,7 +684,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig
index 39db64c7ef..aa74992b4e 100644
--- a/configs/stm3240g-eval/nsh2/defconfig
+++ b/configs/stm3240g-eval/nsh2/defconfig
@@ -675,7 +675,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3240g-eval/nxterm/defconfig b/configs/stm3240g-eval/nxterm/defconfig
index 1ed096c2a7..94440b32fa 100644
--- a/configs/stm3240g-eval/nxterm/defconfig
+++ b/configs/stm3240g-eval/nxterm/defconfig
@@ -694,7 +694,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index 52b8e8f866..24e4a5db75 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -694,7 +694,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig
index 3f70a1200a..923e8ac1ed 100644
--- a/configs/stm3240g-eval/webserver/defconfig
+++ b/configs/stm3240g-eval/webserver/defconfig
@@ -674,7 +674,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig
index 9ccfb0bce1..cd3838b5c7 100644
--- a/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/configs/stm3240g-eval/xmlrpc/defconfig
@@ -664,7 +664,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig
index 86867909cb..cb39c3b326 100644
--- a/configs/stm32_tiny/nsh/defconfig
+++ b/configs/stm32_tiny/nsh/defconfig
@@ -616,7 +616,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig
index 91f0ec630c..82b6a3f2fb 100644
--- a/configs/stm32_tiny/usbnsh/defconfig
+++ b/configs/stm32_tiny/usbnsh/defconfig
@@ -610,7 +610,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32butterfly2/nsh/defconfig b/configs/stm32butterfly2/nsh/defconfig
index 4d265c86d5..cc58d6dc2f 100644
--- a/configs/stm32butterfly2/nsh/defconfig
+++ b/configs/stm32butterfly2/nsh/defconfig
@@ -636,7 +636,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32butterfly2/nshnet/defconfig b/configs/stm32butterfly2/nshnet/defconfig
index fdd07367b5..018450beca 100644
--- a/configs/stm32butterfly2/nshnet/defconfig
+++ b/configs/stm32butterfly2/nshnet/defconfig
@@ -644,7 +644,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32butterfly2/nshusbdev/defconfig b/configs/stm32butterfly2/nshusbdev/defconfig
index f91b4a43a6..cef7a6a75b 100644
--- a/configs/stm32butterfly2/nshusbdev/defconfig
+++ b/configs/stm32butterfly2/nshusbdev/defconfig
@@ -629,7 +629,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32butterfly2/nshusbhost/defconfig b/configs/stm32butterfly2/nshusbhost/defconfig
index 4d265c86d5..cc58d6dc2f 100644
--- a/configs/stm32butterfly2/nshusbhost/defconfig
+++ b/configs/stm32butterfly2/nshusbhost/defconfig
@@ -636,7 +636,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f103-minimum/audio_tone/defconfig b/configs/stm32f103-minimum/audio_tone/defconfig
index 3f25c9d311..18a2d09978 100644
--- a/configs/stm32f103-minimum/audio_tone/defconfig
+++ b/configs/stm32f103-minimum/audio_tone/defconfig
@@ -625,7 +625,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f103-minimum/buttons/defconfig b/configs/stm32f103-minimum/buttons/defconfig
index 5b19cd63bc..0312f7554b 100644
--- a/configs/stm32f103-minimum/buttons/defconfig
+++ b/configs/stm32f103-minimum/buttons/defconfig
@@ -612,7 +612,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f103-minimum/jlx12864g/defconfig b/configs/stm32f103-minimum/jlx12864g/defconfig
index 1dbd7601e9..4a8569c328 100644
--- a/configs/stm32f103-minimum/jlx12864g/defconfig
+++ b/configs/stm32f103-minimum/jlx12864g/defconfig
@@ -655,7 +655,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f103-minimum/nrf24/defconfig b/configs/stm32f103-minimum/nrf24/defconfig
index 23927f4d88..a13598ba74 100644
--- a/configs/stm32f103-minimum/nrf24/defconfig
+++ b/configs/stm32f103-minimum/nrf24/defconfig
@@ -651,7 +651,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f103-minimum/nsh/defconfig b/configs/stm32f103-minimum/nsh/defconfig
index 6c55648311..7664d88825 100644
--- a/configs/stm32f103-minimum/nsh/defconfig
+++ b/configs/stm32f103-minimum/nsh/defconfig
@@ -611,7 +611,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f103-minimum/pwm/defconfig b/configs/stm32f103-minimum/pwm/defconfig
index 551c34e3e7..d8b9bc38da 100644
--- a/configs/stm32f103-minimum/pwm/defconfig
+++ b/configs/stm32f103-minimum/pwm/defconfig
@@ -619,7 +619,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f103-minimum/rfid-rc522/defconfig b/configs/stm32f103-minimum/rfid-rc522/defconfig
index 475d5f3985..a8daaf44f6 100644
--- a/configs/stm32f103-minimum/rfid-rc522/defconfig
+++ b/configs/stm32f103-minimum/rfid-rc522/defconfig
@@ -619,7 +619,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f103-minimum/rgbled/defconfig b/configs/stm32f103-minimum/rgbled/defconfig
index b0adc1cbb3..bae4f13a9f 100644
--- a/configs/stm32f103-minimum/rgbled/defconfig
+++ b/configs/stm32f103-minimum/rgbled/defconfig
@@ -639,7 +639,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f103-minimum/usbnsh/defconfig b/configs/stm32f103-minimum/usbnsh/defconfig
index decc71aa16..e5319a27eb 100644
--- a/configs/stm32f103-minimum/usbnsh/defconfig
+++ b/configs/stm32f103-minimum/usbnsh/defconfig
@@ -613,7 +613,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f103-minimum/userled/defconfig b/configs/stm32f103-minimum/userled/defconfig
index 5c93140792..d49398b75d 100644
--- a/configs/stm32f103-minimum/userled/defconfig
+++ b/configs/stm32f103-minimum/userled/defconfig
@@ -611,7 +611,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f103-minimum/veml6070/defconfig b/configs/stm32f103-minimum/veml6070/defconfig
index f9b79252f7..3d2065e1fa 100644
--- a/configs/stm32f103-minimum/veml6070/defconfig
+++ b/configs/stm32f103-minimum/veml6070/defconfig
@@ -623,7 +623,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig
index 986acf8aa7..5b31d15483 100644
--- a/configs/stm32f3discovery/nsh/defconfig
+++ b/configs/stm32f3discovery/nsh/defconfig
@@ -634,7 +634,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig
index d53ceee3f3..1e7c46dc58 100644
--- a/configs/stm32f3discovery/usbnsh/defconfig
+++ b/configs/stm32f3discovery/usbnsh/defconfig
@@ -641,7 +641,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f411e-disco/nsh/defconfig b/configs/stm32f411e-disco/nsh/defconfig
index 00551e986a..da44560a90 100644
--- a/configs/stm32f411e-disco/nsh/defconfig
+++ b/configs/stm32f411e-disco/nsh/defconfig
@@ -612,7 +612,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig
index 9fc151029c..193be96591 100644
--- a/configs/stm32f429i-disco/extflash/defconfig
+++ b/configs/stm32f429i-disco/extflash/defconfig
@@ -668,7 +668,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f429i-disco/lcd/defconfig b/configs/stm32f429i-disco/lcd/defconfig
index ac6a69bf53..c7c072ee64 100644
--- a/configs/stm32f429i-disco/lcd/defconfig
+++ b/configs/stm32f429i-disco/lcd/defconfig
@@ -659,7 +659,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f429i-disco/ltdc/defconfig b/configs/stm32f429i-disco/ltdc/defconfig
index 39417fd825..7d30ca9818 100644
--- a/configs/stm32f429i-disco/ltdc/defconfig
+++ b/configs/stm32f429i-disco/ltdc/defconfig
@@ -705,7 +705,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig
index 5f5b994e94..ac69c63817 100644
--- a/configs/stm32f429i-disco/nsh/defconfig
+++ b/configs/stm32f429i-disco/nsh/defconfig
@@ -648,7 +648,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f429i-disco/nxwm/defconfig b/configs/stm32f429i-disco/nxwm/defconfig
index e7d1c8279a..5d89ad67f6 100644
--- a/configs/stm32f429i-disco/nxwm/defconfig
+++ b/configs/stm32f429i-disco/nxwm/defconfig
@@ -670,7 +670,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig
index 4a60f8b641..3d31281b67 100644
--- a/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/configs/stm32f429i-disco/usbmsc/defconfig
@@ -663,7 +663,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig
index 39445ee4d8..3cd8e76c73 100644
--- a/configs/stm32f429i-disco/usbnsh/defconfig
+++ b/configs/stm32f429i-disco/usbnsh/defconfig
@@ -654,7 +654,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/canard/defconfig b/configs/stm32f4discovery/canard/defconfig
index 58b871fc8f..112de219fd 100644
--- a/configs/stm32f4discovery/canard/defconfig
+++ b/configs/stm32f4discovery/canard/defconfig
@@ -664,7 +664,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig
index 875b00c1be..d9cc9f6f7b 100644
--- a/configs/stm32f4discovery/cxxtest/defconfig
+++ b/configs/stm32f4discovery/cxxtest/defconfig
@@ -651,7 +651,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig
index 7d9209143d..23ecbe39e0 100644
--- a/configs/stm32f4discovery/elf/defconfig
+++ b/configs/stm32f4discovery/elf/defconfig
@@ -652,7 +652,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/ipv6/defconfig b/configs/stm32f4discovery/ipv6/defconfig
index 83ea38b94c..0a4728f555 100644
--- a/configs/stm32f4discovery/ipv6/defconfig
+++ b/configs/stm32f4discovery/ipv6/defconfig
@@ -694,7 +694,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig
index 6f2535b869..75487b4d9f 100644
--- a/configs/stm32f4discovery/kostest/defconfig
+++ b/configs/stm32f4discovery/kostest/defconfig
@@ -657,7 +657,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig
index f564769ca0..8702fa5338 100644
--- a/configs/stm32f4discovery/netnsh/defconfig
+++ b/configs/stm32f4discovery/netnsh/defconfig
@@ -694,7 +694,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index 389c07a67d..8e8128fc1d 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -659,7 +659,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index 36523d0d38..fbb2ec0dc2 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -660,7 +660,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig
index 3d080ba1d1..7d1bf73755 100644
--- a/configs/stm32f4discovery/pm/defconfig
+++ b/configs/stm32f4discovery/pm/defconfig
@@ -666,7 +666,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/posix_spawn/defconfig b/configs/stm32f4discovery/posix_spawn/defconfig
index fa13076f96..13863f2a46 100644
--- a/configs/stm32f4discovery/posix_spawn/defconfig
+++ b/configs/stm32f4discovery/posix_spawn/defconfig
@@ -652,7 +652,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/pseudoterm/defconfig b/configs/stm32f4discovery/pseudoterm/defconfig
index 761a2b013c..d18d1b560c 100644
--- a/configs/stm32f4discovery/pseudoterm/defconfig
+++ b/configs/stm32f4discovery/pseudoterm/defconfig
@@ -653,7 +653,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/rgbled/defconfig b/configs/stm32f4discovery/rgbled/defconfig
index 091fb6ff78..54780a62af 100644
--- a/configs/stm32f4discovery/rgbled/defconfig
+++ b/configs/stm32f4discovery/rgbled/defconfig
@@ -662,7 +662,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/uavcan/defconfig b/configs/stm32f4discovery/uavcan/defconfig
index 226fe4cb0e..caec09e638 100644
--- a/configs/stm32f4discovery/uavcan/defconfig
+++ b/configs/stm32f4discovery/uavcan/defconfig
@@ -620,7 +620,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig
index 06dc85dfde..88bfe30276 100644
--- a/configs/stm32f4discovery/usbnsh/defconfig
+++ b/configs/stm32f4discovery/usbnsh/defconfig
@@ -665,7 +665,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f4discovery/winbuild/defconfig b/configs/stm32f4discovery/winbuild/defconfig
index 88058e6cfc..1eb0d0f671 100644
--- a/configs/stm32f4discovery/winbuild/defconfig
+++ b/configs/stm32f4discovery/winbuild/defconfig
@@ -551,7 +551,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
#
diff --git a/configs/stm32f4discovery/xen1210/defconfig b/configs/stm32f4discovery/xen1210/defconfig
index 5e76fbf79e..bf4859a9ca 100644
--- a/configs/stm32f4discovery/xen1210/defconfig
+++ b/configs/stm32f4discovery/xen1210/defconfig
@@ -654,7 +654,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f746-ws/nsh/defconfig b/configs/stm32f746-ws/nsh/defconfig
index 8edcdb6f87..e1bbfa82c6 100644
--- a/configs/stm32f746-ws/nsh/defconfig
+++ b/configs/stm32f746-ws/nsh/defconfig
@@ -516,7 +516,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32f746g-disco/nsh/defconfig b/configs/stm32f746g-disco/nsh/defconfig
index 4d1625b4b1..bf4b4b1501 100644
--- a/configs/stm32f746g-disco/nsh/defconfig
+++ b/configs/stm32f746g-disco/nsh/defconfig
@@ -493,7 +493,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32l476-mdk/nsh/defconfig b/configs/stm32l476-mdk/nsh/defconfig
index 3f2ce702a5..8c6736985b 100644
--- a/configs/stm32l476-mdk/nsh/defconfig
+++ b/configs/stm32l476-mdk/nsh/defconfig
@@ -443,7 +443,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32l476vg-disco/nsh/defconfig b/configs/stm32l476vg-disco/nsh/defconfig
index 2e443d717a..69414abb84 100644
--- a/configs/stm32l476vg-disco/nsh/defconfig
+++ b/configs/stm32l476vg-disco/nsh/defconfig
@@ -456,7 +456,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig
index 4c3ba206d6..e287044d8e 100644
--- a/configs/stm32ldiscovery/nsh/defconfig
+++ b/configs/stm32ldiscovery/nsh/defconfig
@@ -618,7 +618,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig
index 7de8efbc97..8f995dc8ec 100644
--- a/configs/stm32vldiscovery/nsh/defconfig
+++ b/configs/stm32vldiscovery/nsh/defconfig
@@ -628,7 +628,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index 25a6a21966..45e9b428be 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -390,7 +390,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index 87b387e3a1..604415e68d 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -392,7 +392,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/teensy-2.0/usbmsc/defconfig b/configs/teensy-2.0/usbmsc/defconfig
index 5854699d35..508d46aa4b 100644
--- a/configs/teensy-2.0/usbmsc/defconfig
+++ b/configs/teensy-2.0/usbmsc/defconfig
@@ -231,7 +231,7 @@ CONFIG_MAX_TASKS=8
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/teensy-3.x/nsh/defconfig b/configs/teensy-3.x/nsh/defconfig
index baafedd820..12b169e4c6 100644
--- a/configs/teensy-3.x/nsh/defconfig
+++ b/configs/teensy-3.x/nsh/defconfig
@@ -387,7 +387,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/teensy-3.x/usbnsh/defconfig b/configs/teensy-3.x/usbnsh/defconfig
index e59d5d45dd..47f8eef746 100644
--- a/configs/teensy-3.x/usbnsh/defconfig
+++ b/configs/teensy-3.x/usbnsh/defconfig
@@ -384,7 +384,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/teensy-lc/nsh/defconfig b/configs/teensy-lc/nsh/defconfig
index f121ca5247..b97c58114f 100644
--- a/configs/teensy-lc/nsh/defconfig
+++ b/configs/teensy-lc/nsh/defconfig
@@ -324,7 +324,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=0
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig
index 71362ab743..645949de1e 100644
--- a/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/configs/tm4c123g-launchpad/nsh/defconfig
@@ -390,7 +390,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/tm4c1294-launchpad/ipv6/defconfig b/configs/tm4c1294-launchpad/ipv6/defconfig
index df9138c111..e24c287f27 100644
--- a/configs/tm4c1294-launchpad/ipv6/defconfig
+++ b/configs/tm4c1294-launchpad/ipv6/defconfig
@@ -406,7 +406,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/tm4c1294-launchpad/nsh/defconfig b/configs/tm4c1294-launchpad/nsh/defconfig
index 5690209be4..d42dc98a3e 100644
--- a/configs/tm4c1294-launchpad/nsh/defconfig
+++ b/configs/tm4c1294-launchpad/nsh/defconfig
@@ -406,7 +406,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index 2768335ce9..f34a9294a2 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -382,7 +382,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/twr-k64f120m/netnsh/defconfig b/configs/twr-k64f120m/netnsh/defconfig
index 5f2d0910c3..e27f688271 100644
--- a/configs/twr-k64f120m/netnsh/defconfig
+++ b/configs/twr-k64f120m/netnsh/defconfig
@@ -421,7 +421,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/twr-k64f120m/nsh/defconfig b/configs/twr-k64f120m/nsh/defconfig
index eccbd57164..bfd649af69 100644
--- a/configs/twr-k64f120m/nsh/defconfig
+++ b/configs/twr-k64f120m/nsh/defconfig
@@ -407,7 +407,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/u-blox-c027/nsh/defconfig b/configs/u-blox-c027/nsh/defconfig
index 8fe80a00a6..529dcf7bda 100644
--- a/configs/u-blox-c027/nsh/defconfig
+++ b/configs/u-blox-c027/nsh/defconfig
@@ -372,7 +372,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index 2fe63ce051..da80577b85 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -389,7 +389,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/viewtool-stm32f107/highpri/defconfig b/configs/viewtool-stm32f107/highpri/defconfig
index 15f574f6c3..7881989330 100644
--- a/configs/viewtool-stm32f107/highpri/defconfig
+++ b/configs/viewtool-stm32f107/highpri/defconfig
@@ -626,7 +626,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index 7362467a7f..a5a48b32ba 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -643,7 +643,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig
index 02c4e16ac0..037cecaeb9 100644
--- a/configs/viewtool-stm32f107/nsh/defconfig
+++ b/configs/viewtool-stm32f107/nsh/defconfig
@@ -623,7 +623,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/xmc4500-relax/nsh/defconfig b/configs/xmc4500-relax/nsh/defconfig
index 14643afe8f..2ee3ed50ff 100644
--- a/configs/xmc4500-relax/nsh/defconfig
+++ b/configs/xmc4500-relax/nsh/defconfig
@@ -326,7 +326,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index f00bed1e28..f757520a04 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -127,7 +127,7 @@ CONFIG_START_YEAR=2012
CONFIG_START_MONTH=12
CONFIG_START_DAY=9
CONFIG_DEV_CONSOLE=y
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
# CONFIG_PRIORITY_INHERITANCE is not set
# CONFIG_FDCLONE_DISABLE is not set
# CONFIG_FDCLONE_STDIO is not set
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index 709e3dc7a1..e74b06c992 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -126,7 +126,7 @@ CONFIG_START_YEAR=2008
CONFIG_START_MONTH=2
CONFIG_START_DAY=21
# CONFIG_DEV_CONSOLE is not set
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
# CONFIG_PRIORITY_INHERITANCE is not set
# CONFIG_FDCLONE_DISABLE is not set
# CONFIG_FDCLONE_STDIO is not set
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index 8e4c51c211..c720f725f3 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -127,7 +127,7 @@ CONFIG_START_YEAR=2012
CONFIG_START_MONTH=12
CONFIG_START_DAY=9
CONFIG_DEV_CONSOLE=y
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
# CONFIG_PRIORITY_INHERITANCE is not set
# CONFIG_FDCLONE_DISABLE is not set
# CONFIG_FDCLONE_STDIO is not set
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index 7114acee80..377508de81 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -217,7 +217,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index 5fc5aa95b0..2f8cdad153 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -217,7 +217,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index 73cbcca1cd..e69a059f67 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -217,7 +217,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index 9d25de2742..a018632f27 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -127,7 +127,7 @@ CONFIG_START_YEAR=2012
CONFIG_START_MONTH=12
CONFIG_START_DAY=7
CONFIG_DEV_CONSOLE=y
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
# CONFIG_PRIORITY_INHERITANCE is not set
# CONFIG_FDCLONE_DISABLE is not set
# CONFIG_FDCLONE_STDIO is not set
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index 04cb098016..3ed03920a7 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -126,7 +126,7 @@ CONFIG_START_YEAR=2007
CONFIG_START_MONTH=2
CONFIG_START_DAY=21
# CONFIG_DEV_CONSOLE is not set
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
# CONFIG_PRIORITY_INHERITANCE is not set
# CONFIG_FDCLONE_DISABLE is not set
# CONFIG_FDCLONE_STDIO is not set
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index 8ffd9fda39..8bd794e872 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -126,7 +126,7 @@ CONFIG_START_YEAR=2012
CONFIG_START_MONTH=12
CONFIG_START_DAY=7
CONFIG_DEV_CONSOLE=y
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
# CONFIG_PRIORITY_INHERITANCE is not set
# CONFIG_FDCLONE_DISABLE is not set
# CONFIG_FDCLONE_STDIO is not set
diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig
index df35f44bfc..ec99f4c3b6 100644
--- a/configs/zkit-arm-1769/nsh/defconfig
+++ b/configs/zkit-arm-1769/nsh/defconfig
@@ -366,7 +366,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig
index 464caa8316..60ef8992a9 100644
--- a/configs/zkit-arm-1769/nxhello/defconfig
+++ b/configs/zkit-arm-1769/nxhello/defconfig
@@ -366,7 +366,7 @@ CONFIG_SCHED_WAITPID=y
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/zp214xpa/nsh/defconfig b/configs/zp214xpa/nsh/defconfig
index 27801bfb26..d066c3058b 100644
--- a/configs/zp214xpa/nsh/defconfig
+++ b/configs/zp214xpa/nsh/defconfig
@@ -285,7 +285,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig
index 0ff83a6c96..e0deb025fa 100644
--- a/configs/zp214xpa/nxlines/defconfig
+++ b/configs/zp214xpa/nxlines/defconfig
@@ -289,7 +289,7 @@ CONFIG_MAX_TASKS=16
#
# Pthread Options
#
-# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
diff --git a/include/pthread.h b/include/pthread.h
index 53eaa0ddaa..edf943c9bb 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -260,7 +260,7 @@ struct pthread_mutexattr_s
#ifdef CONFIG_PRIORITY_INHERITANCE
uint8_t proto : 2; /* See PTHREAD_PRIO_* definitions */
#endif
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
uint8_t type : 2; /* Type of the mutex. See PTHREAD_MUTEX_* definitions */
#endif
#ifdef CONFIG_PTHREAD_MUTEX_BOTH
@@ -286,7 +286,7 @@ struct pthread_mutex_s
#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE
uint8_t flags; /* See _PTHREAD_MFLAGS_* */
#endif
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
uint8_t type; /* Type of the mutex. See PTHREAD_MUTEX_* definitions */
int16_t nlocks; /* The number of recursive locks held */
#endif
@@ -295,7 +295,7 @@ struct pthread_mutex_s
typedef struct pthread_mutex_s pthread_mutex_t;
#define __PTHREAD_MUTEX_T_DEFINED 1
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
# define PTHREAD_MUTEX_INITIALIZER {-1, SEM_INITIALIZER(1), PTHREAD_MUTEX_DEFAULT, 0}
#else
# define PTHREAD_MUTEX_INITIALIZER {-1, SEM_INITIALIZER(1)}
diff --git a/libc/libc.csv b/libc/libc.csv
index d38cc8b161..02cf739bd3 100644
--- a/libc/libc.csv
+++ b/libc/libc.csv
@@ -113,10 +113,10 @@
"pthread_condattr_init","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR pthread_condattr_t *"
"pthread_mutexattr_destroy","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR pthread_mutexattr_t *"
"pthread_mutexattr_getpshared","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR pthread_mutexattr_t *","FAR int *"
-"pthread_mutexattr_gettype","pthread.h","!defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_MUTEX_TYPES)","int","FAR const pthread_mutexattr_t *","int *"
+"pthread_mutexattr_gettype","pthread.h","!defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_PTHREAD_MUTEX_TYPES)","int","FAR const pthread_mutexattr_t *","int *"
"pthread_mutexattr_init","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR pthread_mutexattr_t *"
"pthread_mutexattr_setpshared","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR pthread_mutexattr_t *","int "
-"pthread_mutexattr_settype","pthread.h","!defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_MUTEX_TYPES)","int","pthread_mutexattr_t *","int"
+"pthread_mutexattr_settype","pthread.h","!defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_PTHREAD_MUTEX_TYPES)","int","pthread_mutexattr_t *","int"
"puts","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR const char *"
"qsort","stdlib.h","","void","void *","size_t","size_t","int(*)(const void *","FAR const void *)"
"rand","stdlib.h","","int"
diff --git a/libc/pthread/pthread_mutexattr_gettype.c b/libc/pthread/pthread_mutexattr_gettype.c
index 9f057ae11d..784a347ce8 100644
--- a/libc/pthread/pthread_mutexattr_gettype.c
+++ b/libc/pthread/pthread_mutexattr_gettype.c
@@ -67,7 +67,7 @@ int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type)
{
if (attr != NULL && type != NULL)
{
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
*type = attr->type;
#else
*type = PTHREAD_MUTEX_NORMAL;
diff --git a/libc/pthread/pthread_mutexattr_init.c b/libc/pthread/pthread_mutexattr_init.c
index de6183e56c..895346a6cd 100644
--- a/libc/pthread/pthread_mutexattr_init.c
+++ b/libc/pthread/pthread_mutexattr_init.c
@@ -81,7 +81,7 @@ int pthread_mutexattr_init(FAR pthread_mutexattr_t *attr)
attr->proto = SEM_PRIO_INHERIT;
#endif
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
attr->type = PTHREAD_MUTEX_DEFAULT;
#endif
diff --git a/libc/pthread/pthread_mutexattr_settype.c b/libc/pthread/pthread_mutexattr_settype.c
index b43e86fc12..6047f90ef2 100644
--- a/libc/pthread/pthread_mutexattr_settype.c
+++ b/libc/pthread/pthread_mutexattr_settype.c
@@ -67,7 +67,7 @@ int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type)
{
if (attr && type >= PTHREAD_MUTEX_NORMAL && type <= PTHREAD_MUTEX_RECURSIVE)
{
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
attr->type = type;
#else
if (type != PTHREAD_MUTEX_NORMAL)
diff --git a/sched/Kconfig b/sched/Kconfig
index 60183e67d2..0a09c524fe 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -524,7 +524,7 @@ endmenu # Tasks and Scheduling
menu "Pthread Options"
depends on !DISABLE_PTHREAD
-config MUTEX_TYPES:
+config PTHREAD_MUTEX_TYPES
bool "Enable mutex types"
default n
---help---
diff --git a/sched/pthread/pthread.h b/sched/pthread/pthread.h
index 2e7106495f..bc0238c903 100644
--- a/sched/pthread/pthread.h
+++ b/sched/pthread/pthread.h
@@ -119,7 +119,7 @@ void pthread_mutex_inconsistent(FAR struct pthread_tcb_s *tcb);
# define pthread_mutex_give(m) pthread_givesemaphore(&(m)->sem)
#endif
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
int pthread_mutexattr_verifytype(int type);
#endif
diff --git a/sched/pthread/pthread_mutexconsistent.c b/sched/pthread/pthread_mutexconsistent.c
index 86930e276c..77d9bede3e 100644
--- a/sched/pthread/pthread_mutexconsistent.c
+++ b/sched/pthread/pthread_mutexconsistent.c
@@ -120,7 +120,7 @@ int pthread_mutex_consistent(FAR pthread_mutex_t *mutex)
mutex->pid = -1;
mutex->flags &= _PTHREAD_MFLAGS_ROBUST;
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
mutex->nlocks = 0;
#endif
/* Reset the semaphore. This has the same affect as if the
diff --git a/sched/pthread/pthread_mutexinit.c b/sched/pthread/pthread_mutexinit.c
index e6abe32900..ec84fef609 100644
--- a/sched/pthread/pthread_mutexinit.c
+++ b/sched/pthread/pthread_mutexinit.c
@@ -72,7 +72,7 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex,
FAR const pthread_mutexattr_t *attr)
{
int pshared = 0;
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
uint8_t type = PTHREAD_MUTEX_DEFAULT;
#endif
#ifdef CONFIG_PRIORITY_INHERITANCE
@@ -104,7 +104,7 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex,
#ifdef CONFIG_PRIORITY_INHERITANCE
proto = attr->proto;
#endif
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
type = attr->type;
#endif
#ifdef CONFIG_PTHREAD_MUTEX_BOTH
@@ -141,7 +141,7 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex,
mutex->flags = (robust == PTHREAD_MUTEX_ROBUST ? _PTHREAD_MFLAGS_ROBUST : 0);
#endif
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
/* Set up attributes unique to the mutex type */
mutex->type = type;
diff --git a/sched/pthread/pthread_mutexlock.c b/sched/pthread/pthread_mutexlock.c
index 3013248842..629c3fc0ad 100644
--- a/sched/pthread/pthread_mutexlock.c
+++ b/sched/pthread/pthread_mutexlock.c
@@ -120,7 +120,7 @@ int pthread_mutex_lock(FAR pthread_mutex_t *mutex)
sched_lock();
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
/* All mutex types except for NORMAL (and DEFAULT) will return
* and an error error if the caller does not hold the mutex.
*/
@@ -162,7 +162,7 @@ int pthread_mutex_lock(FAR pthread_mutex_t *mutex)
}
}
else
-#endif /* CONFIG_MUTEX_TYPES */
+#endif /* CONFIG_PTHREAD_MUTEX_TYPES */
#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE
/* The calling thread does not hold the semaphore. The correct
@@ -172,7 +172,7 @@ int pthread_mutex_lock(FAR pthread_mutex_t *mutex)
*/
#ifdef CONFIG_PTHREAD_MUTEX_BOTH
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
/* Include check if this is a NORMAL mutex and that it is robust */
if (mutex->pid > 0 &&
@@ -180,14 +180,14 @@ int pthread_mutex_lock(FAR pthread_mutex_t *mutex)
mutex->type != PTHREAD_MUTEX_NORMAL) &&
sched_gettcb(mutex->pid) == NULL)
-#else /* CONFIG_MUTEX_TYPES */
+#else /* CONFIG_PTHREAD_MUTEX_TYPES */
/* This can only be a NORMAL mutex. Include check if it is robust */
if (mutex->pid > 0 &&
(mutex->flags & _PTHREAD_MFLAGS_ROBUST) != 0 &&
sched_gettcb(mutex->pid) == NULL)
-#endif /* CONFIG_MUTEX_TYPES */
+#endif /* CONFIG_PTHREAD_MUTEX_TYPES */
#else /* CONFIG_PTHREAD_MUTEX_ROBUST */
/* This mutex is always robust, whatever type it is. */
@@ -224,7 +224,7 @@ int pthread_mutex_lock(FAR pthread_mutex_t *mutex)
if (ret == OK)
{
mutex->pid = mypid;
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
mutex->nlocks = 1;
#endif
}
diff --git a/sched/pthread/pthread_mutextrylock.c b/sched/pthread/pthread_mutextrylock.c
index 50c3175de5..9083fd465a 100644
--- a/sched/pthread/pthread_mutextrylock.c
+++ b/sched/pthread/pthread_mutextrylock.c
@@ -111,7 +111,7 @@ int pthread_mutex_trylock(FAR pthread_mutex_t *mutex)
mutex->pid = mypid;
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
if (mutex->type == PTHREAD_MUTEX_RECURSIVE)
{
mutex->nlocks = 1;
@@ -129,7 +129,7 @@ int pthread_mutex_trylock(FAR pthread_mutex_t *mutex)
int errcode = get_errno();
if (errcode == EAGAIN)
{
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
/* Check if recursive mutex was locked by the calling thread. */
if (mutex->type == PTHREAD_MUTEX_RECURSIVE && mutex->pid == mypid)
@@ -157,7 +157,7 @@ int pthread_mutex_trylock(FAR pthread_mutex_t *mutex)
*/
#ifdef CONFIG_PTHREAD_MUTEX_BOTH
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
/* Check if this NORMAL mutex is robust */
if (mutex->pid > 0 &&
@@ -165,14 +165,14 @@ int pthread_mutex_trylock(FAR pthread_mutex_t *mutex)
mutex->type != PTHREAD_MUTEX_NORMAL) &&
sched_gettcb(mutex->pid) == NULL)
-#else /* CONFIG_MUTEX_TYPES */
+#else /* CONFIG_PTHREAD_MUTEX_TYPES */
/* Check if this NORMAL mutex is robust */
if (mutex->pid > 0 &&
(mutex->flags & _PTHREAD_MFLAGS_ROBUST) != 0 &&
sched_gettcb(mutex->pid) == NULL)
-#endif /* CONFIG_MUTEX_TYPES */
+#endif /* CONFIG_PTHREAD_MUTEX_TYPES */
#else /* CONFIG_PTHREAD_MUTEX_ROBUST */
/* This mutex is always robust, whatever type it is. */
diff --git a/sched/pthread/pthread_mutexunlock.c b/sched/pthread/pthread_mutexunlock.c
index b27c9ecda0..6a9bab3f8a 100644
--- a/sched/pthread/pthread_mutexunlock.c
+++ b/sched/pthread/pthread_mutexunlock.c
@@ -92,7 +92,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
sched_lock();
if (mutex != NULL)
{
-#if !defined(CONFIG_PTHREAD_MUTEX_UNSAFE) || defined(CONFIG_MUTEX_TYPES)
+#if !defined(CONFIG_PTHREAD_MUTEX_UNSAFE) || defined(CONFIG_PTHREAD_MUTEX_TYPES)
/* Does the calling thread own the semaphore? If no, should we return
* an error?
*
@@ -112,7 +112,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
if (mutex->pid != (int)getpid())
-#elif defined(CONFIG_PTHREAD_MUTEX_UNSAFE) && defined(CONFIG_MUTEX_TYPES)
+#elif defined(CONFIG_PTHREAD_MUTEX_UNSAFE) && defined(CONFIG_PTHREAD_MUTEX_TYPES)
/* If mutex types are not supported, then all mutexes are NORMAL (or
* DEFAULT). Error checking should never be performed for the
* non-robust NORMAL mutex type.
@@ -124,7 +124,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
/* Skip the error check if this is a non-robust NORMAL mutex */
bool errcheck = ((mutex->flags & _PTHREAD_MFLAGS_ROBUST) != 0);
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
errcheck |= (mutex->type != PTHREAD_MUTEX_NORMAL);
#endif
@@ -150,9 +150,9 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
ret = EPERM;
}
else
-#endif /* !CONFIG_PTHREAD_MUTEX_UNSAFE || CONFIG_MUTEX_TYPES */
+#endif /* !CONFIG_PTHREAD_MUTEX_UNSAFE || CONFIG_PTHREAD_MUTEX_TYPES */
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
/* Yes, the caller owns the semaphore.. Is this a recursive mutex? */
if (mutex->type == PTHREAD_MUTEX_RECURSIVE && mutex->nlocks > 1)
@@ -167,7 +167,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
}
else
-#endif /* CONFIG_MUTEX_TYPES */
+#endif /* CONFIG_PTHREAD_MUTEX_TYPES */
/* This is either a non-recursive mutex or is the outermost unlock of
* a recursive mutex.
@@ -182,7 +182,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
/* Nullify the pid and lock count then post the semaphore */
mutex->pid = -1;
-#ifdef CONFIG_MUTEX_TYPES
+#ifdef CONFIG_PTHREAD_MUTEX_TYPES
mutex->nlocks = 0;
#endif
ret = pthread_mutex_give(mutex);