4 files changed, 8 insertions, 8 deletions
diff --git a/cpukit/posix/src/keyfreememory.c b/cpukit/posix/src/keyfreememory.c
index ff8fc82f6f..71daba4fec 100644
--- a/cpukit/posix/src/keyfreememory.c
+++ b/cpukit/posix/src/keyfreememory.c
@@ -34,17 +34,17 @@ void _POSIX_Keys_Free_memory(
   key_id = the_key->Object.id;
   search_node.key = key_id;
   search_node.thread_id = 0;
-  iter = _RBTree_Find_unprotected( &_POSIX_Keys_Key_value_lookup_tree, &search_node.Key_value_lookup_node );
+  iter = _RBTree_Find( &_POSIX_Keys_Key_value_lookup_tree, &search_node.Key_value_lookup_node );
   if ( !iter )
     return;
   /**
    * find the smallest thread_id node in the rbtree.
    */
-  next = _RBTree_Next_unprotected( iter, RBT_LEFT );
+  next = _RBTree_Next( iter, RBT_LEFT );
   p = _RBTree_Container_of( next, POSIX_Keys_Key_value_pair, Key_value_lookup_node );
   while ( next != NULL && p->key == key_id) {
     iter = next;
-    next = _RBTree_Next_unprotected( iter, RBT_LEFT );
+    next = _RBTree_Next( iter, RBT_LEFT );
     p = _RBTree_Container_of( next, POSIX_Keys_Key_value_pair, Key_value_lookup_node );
   }
 
@@ -53,8 +53,8 @@ void _POSIX_Keys_Free_memory(
    */
   p = _RBTree_Container_of( iter, POSIX_Keys_Key_value_pair, Key_value_lookup_node );
   while ( iter != NULL && p->key == key_id ) {
-    next = _RBTree_Next_unprotected( iter, RBT_RIGHT );
-    _RBTree_Extract_unprotected( &_POSIX_Keys_Key_value_lookup_tree, iter );
+    next = _RBTree_Next( iter, RBT_RIGHT );
+    _RBTree_Extract( &_POSIX_Keys_Key_value_lookup_tree, iter );
     _Chain_Extract_unprotected( &p->Key_values_per_thread_node );
     _POSIX_Keys_Key_value_pair_free( p );
 
diff --git a/cpukit/posix/src/keygetspecific.c b/cpukit/posix/src/keygetspecific.c
index 011917b325..b1e97176e6 100644
--- a/cpukit/posix/src/keygetspecific.c
+++ b/cpukit/posix/src/keygetspecific.c
@@ -51,7 +51,7 @@ void *pthread_getspecific(
     case OBJECTS_LOCAL:
       search_node.key = key;
       search_node.thread_id = _Thread_Executing->Object.id;
-      p = _RBTree_Find_unprotected( &_POSIX_Keys_Key_value_lookup_tree,
+      p = _RBTree_Find( &_POSIX_Keys_Key_value_lookup_tree,
                                     &search_node.Key_value_lookup_node );
       key_data = NULL;
       if ( p ) {
diff --git a/cpukit/posix/src/keyrundestructors.c b/cpukit/posix/src/keyrundestructors.c
index 5f0a69917c..2545486940 100644
--- a/cpukit/posix/src/keyrundestructors.c
+++ b/cpukit/posix/src/keyrundestructors.c
@@ -60,7 +60,7 @@ void _POSIX_Keys_Run_destructors(
      * because Chain_Node is the first member of POSIX_Keys_Key_value_pair
      * structure.
      */
-    _RBTree_Extract_unprotected(
+    _RBTree_Extract(
         &_POSIX_Keys_Key_value_lookup_tree,
         &iter->Key_value_lookup_node
     );
diff --git a/cpukit/posix/src/keysetspecific.c b/cpukit/posix/src/keysetspecific.c
index 8f5ce72035..5cfa90e4e7 100644
--- a/cpukit/posix/src/keysetspecific.c
+++ b/cpukit/posix/src/keysetspecific.c
@@ -54,7 +54,7 @@ int pthread_setspecific(
       value_pair_ptr->key = key;
       value_pair_ptr->thread_id = _Thread_Executing->Object.id;
       value_pair_ptr->value = value;
-      if ( _RBTree_Insert_unprotected( &_POSIX_Keys_Key_value_lookup_tree,
+      if ( _RBTree_Insert( &_POSIX_Keys_Key_value_lookup_tree,
                                        &(value_pair_ptr->Key_value_lookup_node) ) ) {
         _Freechain_Put( (Freechain_Control *)&_POSIX_Keys_Keypool,
                         (void *) value_pair_ptr );