9 files changed, 20 insertions, 20 deletions
diff --git a/cpukit/score/src/rbtree.c b/cpukit/score/src/rbtree.c
index 59dfd760c2..4ec0ad627e 100644
--- a/cpukit/score/src/rbtree.c
+++ b/cpukit/score/src/rbtree.c
@@ -43,7 +43,7 @@ void _RBTree_Initialize(
   count = number_nodes;
   next  = starting_address;
   while ( count-- ) {
-    _RBTree_Insert_unprotected(the_rbtree, next);
+    _RBTree_Insert(the_rbtree, next);
     next           = (RBTree_Node *)
                         _Addresses_Add_offset( (void *) next, node_size );
   }
diff --git a/cpukit/score/src/rbtreeextract.c b/cpukit/score/src/rbtreeextract.c
index 8dafe3b72c..730d3f8be6 100644
--- a/cpukit/score/src/rbtreeextract.c
+++ b/cpukit/score/src/rbtreeextract.c
@@ -21,7 +21,7 @@
  *  @note It does NOT disable interrupts to ensure the atomicity
  *        of the extract operation.
  */
-static void _RBTree_Extract_validate_unprotected(
+static void _RBTree_Extract_validate(
     RBTree_Node *the_node
     )
 {
@@ -91,7 +91,7 @@ static void _RBTree_Extract_validate_unprotected(
  *  @note It does NOT disable interrupts to ensure the atomicity
  *        of the extract operation.
  */
-void _RBTree_Extract_unprotected(
+void _RBTree_Extract(
     RBTree_Control *the_rbtree,
     RBTree_Node *the_node
     )
@@ -105,7 +105,7 @@ void _RBTree_Extract_unprotected(
   /* check if min needs to be updated */
   if (the_node == the_rbtree->first[RBT_LEFT]) {
     RBTree_Node *next;
-    next = _RBTree_Successor_unprotected(the_node);
+    next = _RBTree_Successor(the_node);
     the_rbtree->first[RBT_LEFT] = next;
   }
 
@@ -113,7 +113,7 @@ void _RBTree_Extract_unprotected(
    * do not use else if here. */
   if (the_node == the_rbtree->first[RBT_RIGHT]) {
     RBTree_Node *previous;
-    previous = _RBTree_Predecessor_unprotected(the_node);
+    previous = _RBTree_Predecessor(the_node);
     the_rbtree->first[RBT_RIGHT] = previous;
   }
 
@@ -139,7 +139,7 @@ void _RBTree_Extract_unprotected(
       leaf->parent = target->parent;
     } else {
       /* fix the tree here if the child is a null leaf. */
-      _RBTree_Extract_validate_unprotected(target);
+      _RBTree_Extract_validate(target);
     }
     victim_color = target->color;
     dir = target != target->parent->child[0];
@@ -176,7 +176,7 @@ void _RBTree_Extract_unprotected(
       leaf->parent = the_node->parent;
     } else {
       /* fix the tree here if the child is a null leaf. */
-      _RBTree_Extract_validate_unprotected(the_node);
+      _RBTree_Extract_validate(the_node);
     }
     victim_color = the_node->color;
 
diff --git a/cpukit/score/src/rbtreefind.c b/cpukit/score/src/rbtreefind.c
index 9b2663d493..7aa0b35818 100644
--- a/cpukit/score/src/rbtreefind.c
+++ b/cpukit/score/src/rbtreefind.c
@@ -20,7 +20,7 @@
 #include <rtems/score/rbtreeimpl.h>
 #include <rtems/score/isr.h>
 
-RBTree_Node *_RBTree_Find_unprotected(
+RBTree_Node *_RBTree_Find(
   const RBTree_Control *the_rbtree,
   const RBTree_Node *the_node
 )
diff --git a/cpukit/score/src/rbtreeinsert.c b/cpukit/score/src/rbtreeinsert.c
index a2f6f09ab3..c39249f9ec 100644
--- a/cpukit/score/src/rbtreeinsert.c
+++ b/cpukit/score/src/rbtreeinsert.c
@@ -21,7 +21,7 @@
  *  @note It does NOT disable interrupts to ensure the atomicity of the
  *        append operation.
  */
-static void _RBTree_Validate_insert_unprotected(
+static void _RBTree_Validate_insert(
     RBTree_Node    *the_node
     )
 {
@@ -73,7 +73,7 @@ static void _RBTree_Validate_insert_unprotected(
  *  @note It does NOT disable interrupts to ensure the atomicity
  *        of the extract operation.
  */
-RBTree_Node *_RBTree_Insert_unprotected(
+RBTree_Node *_RBTree_Insert(
     RBTree_Control *the_rbtree,
     RBTree_Node *the_node
     )
@@ -118,7 +118,7 @@ RBTree_Node *_RBTree_Insert_unprotected(
     } /* while(iter_node) */
 
     /* verify red-black properties */
-    _RBTree_Validate_insert_unprotected(the_node);
+    _RBTree_Validate_insert(the_node);
   }
   return (RBTree_Node*)0;
 }
diff --git a/cpukit/score/src/rbtreeiterate.c b/cpukit/score/src/rbtreeiterate.c
index 880fa2b143..629b69fef6 100644
--- a/cpukit/score/src/rbtreeiterate.c
+++ b/cpukit/score/src/rbtreeiterate.c
@@ -3,7 +3,7 @@
  *
  * @ingroup ScoreRBTree
  *
- * @brief _RBTree_Iterate_unprotected() implementation.
+ * @brief _RBTree_Iterate() implementation.
  */
 
 /*
@@ -26,7 +26,7 @@
 
 #include <rtems/score/rbtreeimpl.h>
 
-void _RBTree_Iterate_unprotected(
+void _RBTree_Iterate(
   const RBTree_Control *rbtree,
   RBTree_Direction dir,
   RBTree_Visitor visitor,
@@ -40,6 +40,6 @@ void _RBTree_Iterate_unprotected(
   while ( !stop && current != NULL ) {
     stop = (*visitor)( current, dir, visitor_arg );
 
-    current = _RBTree_Next_unprotected( current, dir );
+    current = _RBTree_Next( current, dir );
   }
 }
diff --git a/cpukit/score/src/rbtreenext.c b/cpukit/score/src/rbtreenext.c
index f3268d246b..5b3d7cb29e 100644
--- a/cpukit/score/src/rbtreenext.c
+++ b/cpukit/score/src/rbtreenext.c
@@ -3,7 +3,7 @@
  *
  * @ingroup ScoreRBTree
  *
- * @brief _RBTree_Next_unprotected() and _RBTree_Next() implementation.
+ * @brief _RBTree_Next() and _RBTree_Next() implementation.
  */
 
 /*
@@ -27,7 +27,7 @@
 #include <rtems/score/rbtreeimpl.h>
 #include <rtems/score/isr.h>
 
-RBTree_Node *_RBTree_Next_unprotected(
+RBTree_Node *_RBTree_Next(
   const RBTree_Node *node,
   RBTree_Direction dir
 )
diff --git a/cpukit/score/src/scheduleredfenqueue.c b/cpukit/score/src/scheduleredfenqueue.c
index 9a9b906bb9..921721fb67 100644
--- a/cpukit/score/src/scheduleredfenqueue.c
+++ b/cpukit/score/src/scheduleredfenqueue.c
@@ -31,6 +31,6 @@ void _Scheduler_EDF_Enqueue(
     (Scheduler_EDF_Per_thread*) the_thread->scheduler_info;
   RBTree_Node *node = &(sched_info->Node);
 
-  _RBTree_Insert_unprotected( &_Scheduler_EDF_Ready_queue, node );
+  _RBTree_Insert( &_Scheduler_EDF_Ready_queue, node );
   sched_info->queue_state = SCHEDULER_EDF_QUEUE_STATE_YES;
 }
diff --git a/cpukit/score/src/scheduleredfextract.c b/cpukit/score/src/scheduleredfextract.c
index b2f91cc1c8..7547cafcb9 100644
--- a/cpukit/score/src/scheduleredfextract.c
+++ b/cpukit/score/src/scheduleredfextract.c
@@ -31,6 +31,6 @@ void _Scheduler_EDF_Extract(
     (Scheduler_EDF_Per_thread*) the_thread->scheduler_info;
   RBTree_Node *node = &(sched_info->Node);
 
-  _RBTree_Extract_unprotected( &_Scheduler_EDF_Ready_queue, node );
+  _RBTree_Extract( &_Scheduler_EDF_Ready_queue, node );
   sched_info->queue_state = SCHEDULER_EDF_QUEUE_STATE_NOT_PRESENTLY;
 }
diff --git a/cpukit/score/src/scheduleredfyield.c b/cpukit/score/src/scheduleredfyield.c
index 4a80168ab4..fc5b13a7a0 100644
--- a/cpukit/score/src/scheduleredfyield.c
+++ b/cpukit/score/src/scheduleredfyield.c
@@ -35,8 +35,8 @@ void _Scheduler_EDF_Yield( Thread_Control *thread )
    * The RBTree has more than one node, enqueue behind the tasks
    * with the same priority in case there are such ones.
    */
-  _RBTree_Extract_unprotected( &_Scheduler_EDF_Ready_queue, thread_node );
-  _RBTree_Insert_unprotected( &_Scheduler_EDF_Ready_queue, thread_node );
+  _RBTree_Extract( &_Scheduler_EDF_Ready_queue, thread_node );
+  _RBTree_Insert( &_Scheduler_EDF_Ready_queue, thread_node );
 
   _ISR_Flash( level );