10 files changed, 12 insertions, 12 deletions
diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c
index e96770acf1..f0891373f6 100644
--- a/cpukit/score/src/thread.c
+++ b/cpukit/score/src/thread.c
@@ -69,7 +69,7 @@ void _Thread_Handler_initialization(void)
       INTERNAL_ERROR_BAD_STACK_HOOK
     );
 
-  _Context_Switch_necessary = false;
+  _Thread_Dispatch_necessary = false;
   _Thread_Executing         = NULL;
   _Thread_Heir              = NULL;
 #if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE )
diff --git a/cpukit/score/src/threadchangepriority.c b/cpukit/score/src/threadchangepriority.c
index 5e14edd575..58f5eb5fd3 100644
--- a/cpukit/score/src/threadchangepriority.c
+++ b/cpukit/score/src/threadchangepriority.c
@@ -137,6 +137,6 @@ void _Thread_Change_priority(
 
   if ( !_Thread_Is_executing_also_the_heir() &&
        _Thread_Executing->is_preemptible )
-    _Context_Switch_necessary = true;
+    _Thread_Dispatch_necessary = true;
   _ISR_Enable( level );
 }
diff --git a/cpukit/score/src/threadclearstate.c b/cpukit/score/src/threadclearstate.c
index 9f89f1a736..c5ab03497a 100644
--- a/cpukit/score/src/threadclearstate.c
+++ b/cpukit/score/src/threadclearstate.c
@@ -89,7 +89,7 @@ void _Thread_Clear_state(
           _Thread_Heir = the_thread;
           if ( _Thread_Executing->is_preemptible ||
                the_thread->current_priority == 0 )
-            _Context_Switch_necessary = true;
+            _Thread_Dispatch_necessary = true;
         }
       }
   }
diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c
index 3d7fe24947..6b745ea281 100644
--- a/cpukit/score/src/threaddispatch.c
+++ b/cpukit/score/src/threaddispatch.c
@@ -89,10 +89,10 @@ void _Thread_Dispatch( void )
 
   executing   = _Thread_Executing;
   _ISR_Disable( level );
-  while ( _Context_Switch_necessary == true ) {
+  while ( _Thread_Dispatch_necessary == true ) {
     heir = _Thread_Heir;
     _Thread_Dispatch_disable_level = 1;
-    _Context_Switch_necessary = false;
+    _Thread_Dispatch_necessary = false;
     _Thread_Executing = heir;
 
     /*
diff --git a/cpukit/score/src/threadready.c b/cpukit/score/src/threadready.c
index ea6f349704..3daa6506bd 100644
--- a/cpukit/score/src/threadready.c
+++ b/cpukit/score/src/threadready.c
@@ -72,7 +72,7 @@ void _Thread_Ready(
   heir = _Thread_Heir;
 
   if ( !_Thread_Is_executing( heir ) && _Thread_Executing->is_preemptible )
-    _Context_Switch_necessary = true;
+    _Thread_Dispatch_necessary = true;
 
   _ISR_Enable( level );
 }
diff --git a/cpukit/score/src/threadresume.c b/cpukit/score/src/threadresume.c
index f1ad9ab0bc..c82466d3b3 100644
--- a/cpukit/score/src/threadresume.c
+++ b/cpukit/score/src/threadresume.c
@@ -79,7 +79,7 @@ void _Thread_Resume(
         _Thread_Heir = the_thread;
         if ( _Thread_Executing->is_preemptible ||
              the_thread->current_priority == 0 )
-          _Context_Switch_necessary = true;
+          _Thread_Dispatch_necessary = true;
       }
     }
   }
diff --git a/cpukit/score/src/threadsetstate.c b/cpukit/score/src/threadsetstate.c
index e1bb9d80db..2edd3bb70d 100644
--- a/cpukit/score/src/threadsetstate.c
+++ b/cpukit/score/src/threadsetstate.c
@@ -81,7 +81,7 @@ void _Thread_Set_state(
      _Thread_Calculate_heir();
 
   if ( _Thread_Is_executing( the_thread ) )
-    _Context_Switch_necessary = true;
+    _Thread_Dispatch_necessary = true;
 
   _ISR_Enable( level );
 }
diff --git a/cpukit/score/src/threadstartmultitasking.c b/cpukit/score/src/threadstartmultitasking.c
index 08c66c3d66..c1311554ea 100644
--- a/cpukit/score/src/threadstartmultitasking.c
+++ b/cpukit/score/src/threadstartmultitasking.c
@@ -61,7 +61,7 @@ void _Thread_Start_multitasking( void )
 
   _System_state_Set( SYSTEM_STATE_UP );
 
-  _Context_Switch_necessary = false;
+  _Thread_Dispatch_necessary = false;
 
   _Thread_Executing = _Thread_Heir;
 
diff --git a/cpukit/score/src/threadsuspend.c b/cpukit/score/src/threadsuspend.c
index 27540ecfef..8cb2796691 100644
--- a/cpukit/score/src/threadsuspend.c
+++ b/cpukit/score/src/threadsuspend.c
@@ -79,7 +79,7 @@ void _Thread_Suspend(
      _Thread_Calculate_heir();
 
   if ( _Thread_Is_executing( the_thread ) )
-    _Context_Switch_necessary = true;
+    _Thread_Dispatch_necessary = true;
 
   _ISR_Enable( level );
 }
diff --git a/cpukit/score/src/threadyieldprocessor.c b/cpukit/score/src/threadyieldprocessor.c
index 9defbeab34..633292d3f6 100644
--- a/cpukit/score/src/threadyieldprocessor.c
+++ b/cpukit/score/src/threadyieldprocessor.c
@@ -67,10 +67,10 @@ void _Thread_Yield_processor( void )
 
       if ( _Thread_Is_heir( executing ) )
         _Thread_Heir = (Thread_Control *) ready->first;
-      _Context_Switch_necessary = true;
+      _Thread_Dispatch_necessary = true;
     }
     else if ( !_Thread_Is_heir( executing ) )
-      _Context_Switch_necessary = true;
+      _Thread_Dispatch_necessary = true;
 
   _ISR_Enable( level );
 }