modified type declarations in RtecScheduler.idl to avoid non-portable IDL declarations with identifiers that differed only by case

27 files changed, 226 insertions, 225 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
index e3a5e1e547b..87a24247e04 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -183,8 +183,8 @@ ACE_ES_Priority_Dispatching::initialize_queues (void)
       ACE_Time_Value period_tv;
       ORBSVCS_Time::TimeT_to_Time_Value (period_tv, ACE_Scheduler_Rates[x]);
 
-      RtecScheduler::Period period = period_tv.sec () * 10000000 +
-                                     period_tv.usec () * 10;
+      RtecScheduler::Period_t period = period_tv.sec () * 10000000 +
+                                       period_tv.usec () * 10;
 
       ACE_NEW (this->queues_[x],
 	       ACE_ES_Dispatch_Queue (this, &notification_strategy_));
@@ -305,8 +305,8 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
   ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PUSH_SOURCE_TYPE_CORRELATION_MODULE);
 
   RtecScheduler::OS_Priority thread_priority;
-  RtecScheduler::Preemption_Subpriority subpriority;
-  RtecScheduler::Preemption_Priority preemption_priority;
+  RtecScheduler::Preemption_Subpriority_t subpriority;
+  RtecScheduler::Preemption_Priority_t preemption_priority;
 
   if (request->rt_info () != 0)
     {
@@ -493,7 +493,7 @@ ACE_ES_Dispatch_Queue::ACE_ES_Dispatch_Queue (ACE_ES_Dispatching_Base *dispatchi
 }
 
 int
-ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period &period,
+ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
                                    int threads)
 {
   // First set up the correct message queue according to whether the
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
index ddf74892afb..17fbf06b9b9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
@@ -168,7 +168,7 @@ public:
 
   void set (ACE_ES_Dispatching_Base *dispatching_module,
             RtecScheduler::OS_Priority priority,
-            RtecScheduler::Preemption_Subpriority sub_priority);
+            RtecScheduler::Preemption_Subpriority_t sub_priority);
   // For multi-threaded implementations, <dispatching_module> is
   // called back when a request is dequeued.  <priority> is the
   // dispatch priority of the event.  <sub_priority> is the enqueue
@@ -334,7 +334,7 @@ public:
   // Stores <dispatching_module> for this->threads_closed.  Stores
   // away <notification_strategy> for this->synch_threads.
 
-  int open_queue (RtecScheduler::Period &period,
+  int open_queue (RtecScheduler::Period_t &period,
                   int threads);
   // This is a hack to get the channel to work with the new
   // scheduler.
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
index 8b9651f1c67..91295bdda7e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
@@ -88,7 +88,7 @@ ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
 ACE_INLINE void
 ACE_ES_Dispatch_Request::set (ACE_ES_Dispatching_Base *dispatching_module,
 			      RtecScheduler::OS_Priority preemption_priority,
-			      RtecScheduler::Preemption_Subpriority sub_priority)
+			      RtecScheduler::Preemption_Subpriority_t sub_priority)
 {
   dispatching_module_ = dispatching_module;
   priority_ = preemption_priority;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 17fdb2badba..36e15218e97 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -91,13 +91,13 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Event_Channel_Timeprobe_Description,
 
 // ************************************************************
 
-static RtecScheduler::Preemption_Priority
+static RtecScheduler::Preemption_Priority_t
 Preemption_Priority (RtecScheduler::handle_t rtinfo,
                      CORBA::Environment &_env)
 {
   RtecScheduler::OS_Priority thread_priority;
-  RtecScheduler::Preemption_Subpriority subpriority;
-  RtecScheduler::Preemption_Priority preemption_priority;
+  RtecScheduler::Preemption_Subpriority_t subpriority;
+  RtecScheduler::Preemption_Priority_t preemption_priority;
 
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_PREEMPTION_PRIORITY_PRIORITY_REQUESTED);
   ACE_Scheduler_Factory::server ()->priority
@@ -151,7 +151,7 @@ public:
       // request to get the appropriate preemption priority.
       ACE_ES_Dependency_Iterator iter (consumer->qos ().dependencies);
       CORBA::Environment env;
-      RtecScheduler::Preemption_Priority p =
+      RtecScheduler::Preemption_Priority_t p =
         ACE_Scheduler_MIN_PREEMPTION_PRIORITY;
       while (iter.advance_dependency () == 0)
         {
@@ -162,7 +162,7 @@ public:
               type != ACE_ES_DISJUNCTION_DESIGNATOR)
             {
               env.clear ();
-              RtecScheduler::Preemption_Priority q =
+              RtecScheduler::Preemption_Priority_t q =
                 ::Preemption_Priority ((*iter).rt_info, env);
               if (env.exception () != 0)
                 continue;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
index 982f739d168..805fddb9087 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
@@ -686,7 +686,7 @@ ACE_ES_Conjunction_Group::add_events (TAO_EC_Event_Array *outbox,
 ACE_INLINE int
 ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info,
 				  const ACE_ES_Timer_ACT *act,
-				  RtecScheduler::Preemption_Priority preemption_priority,
+				  RtecScheduler::Preemption_Priority_t preemption_priority,
 				  const RtecScheduler::Time &delta,
 				  const RtecScheduler::Time &interval)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
index 8ed2025336b..9745f0f3906 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
@@ -103,8 +103,8 @@ ACE_RT_Task::svc (void)
 #endif
 
       RtecScheduler::OS_Priority thread_priority;
-      RtecScheduler::Preemption_Subpriority subpriority;
-      RtecScheduler::Preemption_Priority preemption_priority;
+      RtecScheduler::Preemption_Subpriority_t subpriority;
+      RtecScheduler::Preemption_Priority_t preemption_priority;
 
       ACE_Scheduler_Factory::server ()->priority
         (this->rt_info_,
@@ -285,8 +285,8 @@ ACE_RT_Task::synch_threads (size_t threads)
     // Add threads.
     {
       RtecScheduler::OS_Priority thread_priority;
-      RtecScheduler::Preemption_Subpriority subpriority;
-      RtecScheduler::Preemption_Priority preemption_priority;
+      RtecScheduler::Preemption_Subpriority_t subpriority;
+      RtecScheduler::Preemption_Priority_t preemption_priority;
 
       TAO_TRY
         {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
index 0271d07cfc5..dfe0b8ae02e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
@@ -51,7 +51,7 @@ ACE_ES_Reactor_Task::svc_hook(RtecScheduler::OS_Priority)
 }
 
 int
-ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period &period)
+ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period)
 {
   // Create a name for ourselves using the period.  The period is
   // in 100 ns units; first convert to usec by dividing by 10.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h
index 8ae5982544d..d36eafc72f3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h
@@ -47,7 +47,7 @@ public:
   virtual int svc_hook(RtecScheduler::OS_Priority);
   // Assume ownership of the reactor_.
 
-  int open_reactor (RtecScheduler::Period &period);
+  int open_reactor (RtecScheduler::Period_t &period);
   // This is a hack for now.
 
   virtual int svc_one();
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
index f670dbf2a5c..4e0e8fe501d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
@@ -37,14 +37,14 @@ TAO_EC_ST_Timer_Module::shutdown (void)
 }
 
 RtecScheduler::handle_t
-TAO_EC_ST_Timer_Module::rt_info (RtecScheduler::Preemption_Priority)
+TAO_EC_ST_Timer_Module::rt_info (RtecScheduler::Preemption_Priority_t)
 {
   // @@ TODO......
   return 0;
 }
 
 int
-TAO_EC_ST_Timer_Module::schedule_timer (RtecScheduler::Preemption_Priority,
+TAO_EC_ST_Timer_Module::schedule_timer (RtecScheduler::Preemption_Priority_t,
                                         ACE_Event_Handler* eh,
                                         void* act,
                                         const ACE_Time_Value& delta,
@@ -54,7 +54,7 @@ TAO_EC_ST_Timer_Module::schedule_timer (RtecScheduler::Preemption_Priority,
 }
 
 int
-TAO_EC_ST_Timer_Module::cancel_timer (RtecScheduler::Preemption_Priority,
+TAO_EC_ST_Timer_Module::cancel_timer (RtecScheduler::Preemption_Priority_t,
                                       int id,
                                       const void*& act)
 {
@@ -62,7 +62,7 @@ TAO_EC_ST_Timer_Module::cancel_timer (RtecScheduler::Preemption_Priority,
 }
 
 int
-TAO_EC_ST_Timer_Module::register_handler (RtecScheduler::Preemption_Priority,
+TAO_EC_ST_Timer_Module::register_handler (RtecScheduler::Preemption_Priority_t,
                                           ACE_Event_Handler* eh,
                                           ACE_HANDLE handle)
 {
@@ -70,7 +70,7 @@ TAO_EC_ST_Timer_Module::register_handler (RtecScheduler::Preemption_Priority,
 }
 
 ACE_Reactor*
-TAO_EC_ST_Timer_Module::reactor (RtecScheduler::Preemption_Priority)
+TAO_EC_ST_Timer_Module::reactor (RtecScheduler::Preemption_Priority_t)
 {
   return this->reactor_;
 }
@@ -110,8 +110,8 @@ void TAO_EC_RPT_Timer_Module::activate (void)
       ACE_Time_Value period_tv;
       ORBSVCS_Time::TimeT_to_Time_Value (period_tv, ACE_Scheduler_Rates[i]);
 
-      RtecScheduler::Period period = period_tv.sec () * 10000000 +
-                                     period_tv.usec () * 10;
+      RtecScheduler::Period_t period = period_tv.sec () * 10000000 +
+                                       period_tv.usec () * 10;
 
       ACE_NEW (this->reactorTasks[i], ReactorTask);
 
@@ -145,13 +145,13 @@ TAO_EC_RPT_Timer_Module::shutdown (void)
 }
 
 RtecScheduler::handle_t
-TAO_EC_RPT_Timer_Module::rt_info (RtecScheduler::Preemption_Priority priority)
+TAO_EC_RPT_Timer_Module::rt_info (RtecScheduler::Preemption_Priority_t priority)
 {
   return this->GetReactorTask (priority)->rt_info ();
 }
 
 int
-TAO_EC_RPT_Timer_Module::schedule_timer (RtecScheduler::Preemption_Priority priority,
+TAO_EC_RPT_Timer_Module::schedule_timer (RtecScheduler::Preemption_Priority_t priority,
                                          ACE_Event_Handler* eh,
                                          void* act,
                                          const ACE_Time_Value& delta,
@@ -161,7 +161,7 @@ TAO_EC_RPT_Timer_Module::schedule_timer (RtecScheduler::Preemption_Priority prio
 }
 
 int
-TAO_EC_RPT_Timer_Module::cancel_timer (RtecScheduler::Preemption_Priority priority,
+TAO_EC_RPT_Timer_Module::cancel_timer (RtecScheduler::Preemption_Priority_t priority,
                                        int id,
                                        const void*& act)
 {
@@ -169,7 +169,7 @@ TAO_EC_RPT_Timer_Module::cancel_timer (RtecScheduler::Preemption_Priority priori
 }
 
 int
-TAO_EC_RPT_Timer_Module::register_handler (RtecScheduler::Preemption_Priority priority,
+TAO_EC_RPT_Timer_Module::register_handler (RtecScheduler::Preemption_Priority_t priority,
                                            ACE_Event_Handler* eh,
                                            ACE_HANDLE handle)
 {
@@ -177,7 +177,7 @@ TAO_EC_RPT_Timer_Module::register_handler (RtecScheduler::Preemption_Priority pr
 }
 
 ACE_Reactor*
-TAO_EC_RPT_Timer_Module::reactor (RtecScheduler::Preemption_Priority priority)
+TAO_EC_RPT_Timer_Module::reactor (RtecScheduler::Preemption_Priority_t priority)
 {
   return &this->GetReactorTask (priority)->get_reactor ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
index 2d988fac177..dc683fe69e3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
@@ -45,24 +45,24 @@ public:
      rt_info (RtecScheduler::OS_Priority priority) = 0;
   // The RT_Info handle for the "task" at <priority>
 
-  virtual int schedule_timer (RtecScheduler::Preemption_Priority priority,
+  virtual int schedule_timer (RtecScheduler::Preemption_Priority_t priority,
                               ACE_Event_Handler* eh,
                               void* act,
                               const ACE_Time_Value& delta,
                               const ACE_Time_Value& interval) = 0;
   // Add a timer at the given priority, returns the timer ID.
 
-  virtual int cancel_timer (RtecScheduler::Preemption_Priority priority,
+  virtual int cancel_timer (RtecScheduler::Preemption_Priority_t priority,
                             int id,
                             const void*& act) = 0;
   // Add a timer at the given priority.
 
-  virtual int register_handler (RtecScheduler::Preemption_Priority priority,
+  virtual int register_handler (RtecScheduler::Preemption_Priority_t priority,
                                 ACE_Event_Handler* eh,
                                 ACE_HANDLE handle) = 0;
   // Register a handler?????
 
-  virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority) = 0;
+  virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority_t priority) = 0;
   // Obtain the reactor for the given priority.
   // @@ This may prove tricky to implement with timer queues not based
   // on reactors.
@@ -90,19 +90,19 @@ public:
   virtual void activate (void);
   virtual void shutdown (void);
   virtual RtecScheduler::handle_t
-     rt_info (RtecScheduler::Preemption_Priority priority);
-  virtual int schedule_timer (RtecScheduler::Preemption_Priority priority,
+     rt_info (RtecScheduler::Preemption_Priority_t priority);
+  virtual int schedule_timer (RtecScheduler::Preemption_Priority_t priority,
                               ACE_Event_Handler* eh,
                               void* act,
                               const ACE_Time_Value& delta,
                               const ACE_Time_Value& interval);
-  virtual int cancel_timer (RtecScheduler::Preemption_Priority priority,
+  virtual int cancel_timer (RtecScheduler::Preemption_Priority_t priority,
                             int id,
                             const void*& act);
-  virtual int register_handler (RtecScheduler::Preemption_Priority priority,
+  virtual int register_handler (RtecScheduler::Preemption_Priority_t priority,
                                 ACE_Event_Handler* eh,
                                 ACE_HANDLE handle);
-  virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority);
+  virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority_t priority);
 
 private:
   ACE_Reactor* reactor_;
@@ -133,7 +133,7 @@ public:
 
   typedef ACE_ES_Reactor_Task ReactorTask;
 
-  ReactorTask* GetReactorTask(RtecScheduler::Preemption_Priority priority);
+  ReactorTask* GetReactorTask(RtecScheduler::Preemption_Priority_t priority);
   // Obtain the ReactorTask for the given priority.
   // The Task must have been created already.
 
@@ -144,19 +144,19 @@ public:
   virtual void activate (void);
   virtual void shutdown (void);
   virtual RtecScheduler::handle_t
-     rt_info (RtecScheduler::Preemption_Priority priority);
-  virtual int schedule_timer (RtecScheduler::Preemption_Priority priority,
+     rt_info (RtecScheduler::Preemption_Priority_t priority);
+  virtual int schedule_timer (RtecScheduler::Preemption_Priority_t priority,
                               ACE_Event_Handler* eh,
                               void* act,
                               const ACE_Time_Value& delta,
                               const ACE_Time_Value& interval);
-  virtual int cancel_timer (RtecScheduler::Preemption_Priority priority,
+  virtual int cancel_timer (RtecScheduler::Preemption_Priority_t priority,
                             int id,
                             const void*& act);
-  virtual int register_handler (RtecScheduler::Preemption_Priority priority,
+  virtual int register_handler (RtecScheduler::Preemption_Priority_t priority,
                                 ACE_Event_Handler* eh,
                                 ACE_HANDLE handle);
-  virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority);
+  virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority_t priority);
 
 private:
   int shutdown_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.i b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.i
index b2bf243de55..5451e776399 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.i
@@ -3,7 +3,7 @@
 //
 
 ACE_INLINE TAO_EC_RPT_Timer_Module::ReactorTask*
-TAO_EC_RPT_Timer_Module::GetReactorTask(RtecScheduler::Preemption_Priority priority)
+TAO_EC_RPT_Timer_Module::GetReactorTask(RtecScheduler::Preemption_Priority_t priority)
 {
   if (reactorTasks[priority] == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
index aeb8e9d6352..88d08153340 100644
--- a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
@@ -6,11 +6,11 @@ module RtecScheduler
 {
   // Module TimeBase defines the OMG Time Service.
   typedef TimeBase::TimeT Time; // 100 nanoseconds
-  typedef Time Quantum;
+  typedef Time Quantum_t;
 
-  typedef long Period; // 100 nanoseconds
+  typedef long Period_t; // 100 nanoseconds
 
-  enum Criticality
+  enum Criticality_t
   // Defines the criticality of the operation.
   // For use with Dynamic Scheduler.
   {
@@ -21,7 +21,7 @@ module RtecScheduler
     VERY_HIGH_CRITICALITY
   };
 
-  enum Importance
+  enum Importance_t
   // Defines the importance of the operation,
   // which can be used by the Scheduler as a
   // "tie-breaker" when other scheduling
@@ -34,7 +34,7 @@ module RtecScheduler
     VERY_HIGH_IMPORTANCE
   };
 
-  enum Info_Type
+  enum Info_Type_t
   // Defines type of operation information.
   {
     OPERATION,
@@ -43,7 +43,7 @@ module RtecScheduler
     REMOTE_DEPENDANT
   };
 
-  enum Dependency_Type
+  enum Dependency_Type_t
   // Specify one-way or two-way call.
   {
     ONE_WAY_CALL,
@@ -56,7 +56,7 @@ module RtecScheduler
 
   struct Dependency_Info
   {
-    Dependency_Type dependency_type;
+    Dependency_Type_t dependency_type;
     long number_of_calls;
     handle_t rt_info;
     // Notice the reference to the RT_Info we
@@ -66,8 +66,8 @@ module RtecScheduler
   typedef sequence<Dependency_Info> Dependency_Set;
 
   typedef long OS_Priority;
-  typedef long Preemption_Subpriority;
-  typedef long Preemption_Priority;
+  typedef long Preemption_Subpriority_t;
+  typedef long Preemption_Priority_t;
 
   struct RT_Info
     // = TITLE
@@ -97,16 +97,16 @@ module RtecScheduler
     // the rate.  0 means "completely pasive",
     // i.e., this operation only executes when
     // called.
-    Period period;
+    Period_t period;
 
     // Operation Criticality (user assigned significance).
-    Criticality criticality;
+    Criticality_t criticality;
 
     // Operation importance, used to "break ties".
-    Importance importance;
+    Importance_t importance;
 
     // For time-slicing (for BACKGROUND operations only).
-    Quantum quantum;
+    Quantum_t quantum;
 
     // The number of internal threads contained by
     // the operation.
@@ -124,13 +124,13 @@ module RtecScheduler
     OS_Priority priority;
 
     // For ordering RT_Info's with equal priority.
-    Preemption_Subpriority preemption_subpriority;
+    Preemption_Subpriority_t preemption_subpriority;
 
     // The queue number for this RT_Info.
-    Preemption_Priority preemption_priority;
+    Preemption_Priority_t preemption_priority;
 
     // Info_Type
-    Info_Type info_type;
+    Info_Type_t info_type;
 
     // Token reserved for the scheduler's internal use:
     // information placed here from outside the scheduler
@@ -138,7 +138,7 @@ module RtecScheduler
     unsigned long volatile_token;
   };
 
-  enum Dispatching_Type
+  enum Dispatching_Type_t
   // Defines the type of prioritization strategy
   // to be used by a dispatching queue
   {
@@ -158,13 +158,13 @@ module RtecScheduler
     // information.
   {
     // preemption priority for messages dispatched by the queue
-    Preemption_Priority preemption_priority;
+    Preemption_Priority_t preemption_priority;
 
     // OS priority of the dispatching thread associated with the queue
     OS_Priority thread_priority;
 
     // type of dispatching queue 
-    Dispatching_Type dispatching_type;
+    Dispatching_Type_t dispatching_type;
   };
 
   typedef sequence<Config_Info> Config_Info_Set;
@@ -256,15 +256,15 @@ module RtecScheduler
     // Retrieve information about an RT_Info.
 
     void set (in handle_t handle,
-              in Criticality criticality,
-              in Time time,
+              in Criticality_t criticality,
+              in Time wc_time,
               in Time typical_time,
               in Time cached_time,
-              in Period period,
-              in Importance importance,
-              in Quantum quantum,
+              in Period_t period,
+              in Importance_t importance,
+              in Quantum_t quantum,
               in long threads,
-              in Info_Type info_type)
+              in Info_Type_t info_type)
       raises (UNKNOWN_TASK);
     // Set the attributes of an RT_Info.
     // Notice that some values may not be modified (like priority).
@@ -273,20 +273,20 @@ module RtecScheduler
     void add_dependency (in handle_t handle,
                          in handle_t dependency,
                          in long number_of_calls,
-                         in Dependency_Type dependency_type)
+                         in Dependency_Type_t dependency_type)
       raises (UNKNOWN_TASK);
     // Adds <dependency> to <handle>.
-    // Dependency_Type is only used with the Dynamic Scheduler.
+    // Dependency_Type_t is only used with the Dynamic Scheduler.
 
     void priority (in handle_t handle,
-                       out OS_Priority priority,
-                       out Preemption_Subpriority p_subpriority,
-                       out Preemption_Priority p_priority)
+                   out OS_Priority o_priority,
+                   out Preemption_Subpriority_t p_subpriority,
+                   out Preemption_Priority_t p_priority)
       raises (UNKNOWN_TASK, NOT_SCHEDULED);
     void entry_point_priority (in string entry_point,
-                               out OS_Priority priority,
-                               out Preemption_Subpriority p_subpriority,
-                               out Preemption_Priority p_priority)
+                               out OS_Priority o_priority,
+                               out Preemption_Subpriority_t p_subpriority,
+                               out Preemption_Priority_t p_priority)
       raises (UNKNOWN_TASK, NOT_SCHEDULED);
     // Obtain the run time priorities.
     // TODO: Do we need the two interfaces or is it simply confusing?
@@ -315,7 +315,7 @@ module RtecScheduler
     //
     // struct Dependency {
     //   long number_of_calls;
-    //   Dependency_Type dependency_type;
+    //   Dependency_Type_t dependency_type;
     //   handle_t dependency;
     // };
     // typedef sequence<Dependency> Dependency_Set;
@@ -328,9 +328,9 @@ module RtecScheduler
     //    raises (UNKNOWN_TASK);
     // Returns the number of dependencies.
 
-    void dispatch_configuration (in Preemption_Priority p_priority,
-                                 out OS_Priority os_priority,
-                                 out Dispatching_Type d_type)
+    void dispatch_configuration (in Preemption_Priority_t p_priority,
+                                 out OS_Priority o_priority,
+                                 out Dispatching_Type_t d_type)
       raises (UNKNOWN_PRIORITY_LEVEL, NOT_SCHEDULED);
     // Returns the thread priority and dispatching type assigned
     // to the dispatching priority level that was passed in.  This
@@ -345,7 +345,7 @@ module RtecScheduler
     //    raises (UNKNOWN_PRIORITY_LEVEL);
 
 
-    Preemption_Priority last_scheduled_priority ()
+    Preemption_Priority_t last_scheduled_priority ()
       raises (NOT_SCHEDULED);
     // Returns the last priority number assigned to an operation in the schedule.
     // The number returned is one less than the total number of scheduled priorities.
@@ -356,3 +356,4 @@ module RtecScheduler
   };
 };
 
+
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 18f2ebdcdff..7b4542a3e81 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -71,28 +71,28 @@ ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle,
   info->typical_execution_time = rt_info_[handle - 1].typical_execution_time;
   info->cached_execution_time = rt_info_[handle - 1].cached_execution_time;
   info->period = rt_info_[handle - 1].period;
-  info->criticality = RtecScheduler::Criticality(rt_info_[handle - 1].criticality);
-  info->importance = RtecScheduler::Importance(rt_info_[handle - 1].importance);
+  info->criticality = RtecScheduler::Criticality_t(rt_info_[handle - 1].criticality);
+  info->importance = RtecScheduler::Importance_t(rt_info_[handle - 1].importance);
   info->quantum = rt_info_[handle - 1].quantum;
   info->threads = rt_info_[handle - 1].threads;
   info->priority = rt_info_[handle - 1].priority;
   info->preemption_subpriority = rt_info_[handle - 1].static_subpriority;
   info->preemption_priority = rt_info_[handle - 1].preemption_priority;
-  info->info_type = RtecScheduler::Info_Type(rt_info_[handle - 1].info_type);
+  info->info_type = RtecScheduler::Info_Type_t(rt_info_[handle - 1].info_type);
 
   return info;
 }
 
 void ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
-                                 RtecScheduler::Criticality criticality,
+                                 RtecScheduler::Criticality_t criticality,
 				 RtecScheduler::Time time,
 				 RtecScheduler::Time typical_time,
 				 RtecScheduler::Time cached_time,
-                                 RtecScheduler::Period period,
-                                 RtecScheduler::Importance importance,
-                                 RtecScheduler::Quantum quantum,
+                                 RtecScheduler::Period_t period,
+                                 RtecScheduler::Importance_t importance,
+                                 RtecScheduler::Quantum_t quantum,
                                  CORBA::Long threads,
-                                 RtecScheduler::Info_Type info_type,
+                                 RtecScheduler::Info_Type_t info_type,
                                  CORBA::Environment &_env)
      TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
@@ -124,9 +124,9 @@ void ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
 
 
 void ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
-                                      RtecScheduler::OS_Priority& priority,
-                                      RtecScheduler::Preemption_Subpriority& subpriority,
-                                      RtecScheduler::Preemption_Priority& p_priority,
+                                      RtecScheduler::OS_Priority& o_priority,
+                                      RtecScheduler::Preemption_Subpriority_t& subpriority,
+                                      RtecScheduler::Preemption_Priority_t& p_priority,
                                       CORBA::Environment &_env)
      TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
@@ -138,7 +138,7 @@ void ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
       // NOTREACHED
     }
 
-  priority = rt_info_[handle - 1].priority;
+  o_priority = rt_info_[handle - 1].priority;
   subpriority = rt_info_[handle - 1].static_subpriority;
   p_priority = rt_info_[handle - 1].preemption_priority;
   // ACE_DEBUG ((LM_DEBUG, "(%t) Returning priority %d\n", priority));
@@ -146,8 +146,8 @@ void ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
 
 void ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
                                                   RtecScheduler::OS_Priority& priority,
-                                                  RtecScheduler::Preemption_Subpriority& subpriority,
-                                                  RtecScheduler::Preemption_Priority& p_priority,
+                                                  RtecScheduler::Preemption_Subpriority_t& subpriority,
+                                                  RtecScheduler::Preemption_Priority_t& p_priority,
                                                   CORBA::Environment &_env)
      TAO_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
@@ -165,7 +165,7 @@ void ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
 void ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                             RtecScheduler::handle_t dependency,
                                             CORBA::Long number_of_calls,
-                                            RtecScheduler::Dependency_Type
+                                            RtecScheduler::Dependency_Type_t
                                               dependency_type,
                                             CORBA::Environment &_env)
      TAO_THROW_SPEC ((CORBA::SystemException,
@@ -212,9 +212,9 @@ void ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
 }
 
 
-void ACE_Runtime_Scheduler::dispatch_configuration(RtecScheduler::Preemption_Priority p_priority,
+void ACE_Runtime_Scheduler::dispatch_configuration(RtecScheduler::Preemption_Priority_t p_priority,
 						   RtecScheduler::OS_Priority& priority,
-                                                   RtecScheduler::Dispatching_Type & d_type,
+                                                   RtecScheduler::Dispatching_Type_t & d_type,
 						   CORBA::Environment &_env)
      TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::NOT_SCHEDULED,
@@ -242,7 +242,7 @@ void ACE_Runtime_Scheduler::dispatch_configuration(RtecScheduler::Preemption_Pri
 }
   // provide the thread priority and queue type for the given priority level
 
-RtecScheduler::Preemption_Priority 
+RtecScheduler::Preemption_Priority_t 
 ACE_Runtime_Scheduler::last_scheduled_priority (CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
@@ -251,11 +251,11 @@ ACE_Runtime_Scheduler::last_scheduled_priority (CORBA::Environment &_env)
   if (config_count_ <= 0)
   {
     TAO_THROW_RETURN (RtecScheduler::NOT_SCHEDULED(), 
-		              (RtecScheduler::Preemption_Priority) -1);
+		              (RtecScheduler::Preemption_Priority_t) -1);
   }
   else
   {
-    return (RtecScheduler::Preemption_Priority) (config_count_ - 1);
+    return (RtecScheduler::Preemption_Priority_t) (config_count_ - 1);
   }
 }
   // Returns the last priority number assigned to an operation in the schedule.
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index 3b8200a21bd..3fe6422c284 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -39,31 +39,31 @@ public:
     TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void set (RtecScheduler::handle_t handle,
-                    RtecScheduler::Criticality criticality,
+                    RtecScheduler::Criticality_t criticality,
                     RtecScheduler::Time time,
                     RtecScheduler::Time typical_time,
                     RtecScheduler::Time cached_time,
-                    RtecScheduler::Period period,
-                    RtecScheduler::Importance importance,
-                    RtecScheduler::Quantum quantum,
+                    RtecScheduler::Period_t period,
+                    RtecScheduler::Importance_t importance,
+                    RtecScheduler::Quantum_t quantum,
                     CORBA::Long threads,
-                    RtecScheduler::Info_Type info_type,
+                    RtecScheduler::Info_Type_t info_type,
                     CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void priority (RtecScheduler::handle_t handle,
-                         RtecScheduler::OS_Priority& priority,
-                         RtecScheduler::Preemption_Subpriority& p_subpriority,
-                         RtecScheduler::Preemption_Priority& p_priority,
+                         RtecScheduler::OS_Priority& o_priority,
+                         RtecScheduler::Preemption_Subpriority_t& p_subpriority,
+                         RtecScheduler::Preemption_Priority_t& p_priority,
                          CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
 
   virtual void entry_point_priority (const char * entry_point,
-                                     RtecScheduler::OS_Priority& priority,
-                                     RtecScheduler::Preemption_Subpriority& p_subpriority,
-                                     RtecScheduler::Preemption_Priority& p_priority,
+                                     RtecScheduler::OS_Priority& o_priority,
+                                     RtecScheduler::Preemption_Subpriority_t& p_subpriority,
+                                     RtecScheduler::Preemption_Priority_t& p_priority,
                                      CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
@@ -72,7 +72,7 @@ public:
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type dependency_type,
+                               RtecScheduler::Dependency_Type_t dependency_type,
                                CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
@@ -88,16 +88,16 @@ public:
                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
                      RtecScheduler::TASK_COUNT_MISMATCH));
 
-  virtual void dispatch_configuration (RtecScheduler::Preemption_Priority p_priority,
-                                       RtecScheduler::OS_Priority& priority,
-                                       RtecScheduler::Dispatching_Type & d_type,
+  virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
+                                       RtecScheduler::OS_Priority& o_priority,
+                                       RtecScheduler::Dispatching_Type_t & d_type,
                                        CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // provide the thread priority and queue type for the given priority level
 
-  virtual RtecScheduler::Preemption_Priority last_scheduled_priority (CORBA::Environment &_env)
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED));
   // Returns the last priority number assigned to an operation in the schedule.
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index 997c74dffeb..3a025f22748 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -17,7 +17,7 @@ ACE_RCSID(Sched, Config_Scheduler, "$Id$")
 
 ACE_Config_Scheduler::ACE_Config_Scheduler (void)
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
-  : scheduler_strategy_ ((RtecScheduler::Preemption_Priority) TAO_MIN_CRITICAL_PRIORITY)
+  : scheduler_strategy_ ((RtecScheduler::Preemption_Priority_t) TAO_MIN_CRITICAL_PRIORITY)
   , impl (new ACE_Strategy_Scheduler (scheduler_strategy_))
 #else
   : impl (new Scheduler_Generic)
@@ -131,15 +131,15 @@ ACE_Config_Scheduler::get (RtecScheduler::handle_t handle,
 }
 
 void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
-                                RtecScheduler::Criticality criticality,
+                                RtecScheduler::Criticality_t criticality,
 				RtecScheduler::Time time,
 				RtecScheduler::Time typical_time,
 				RtecScheduler::Time cached_time,
-                                RtecScheduler::Period period,
-                                RtecScheduler::Importance importance,
-                                RtecScheduler::Quantum quantum,
+                                RtecScheduler::Period_t period,
+                                RtecScheduler::Importance_t importance,
+                                RtecScheduler::Quantum_t quantum,
                                 CORBA::Long threads,
-                                RtecScheduler::Info_Type info_type,
+                                RtecScheduler::Info_Type_t info_type,
                                 CORBA::Environment &)
      TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
@@ -170,8 +170,8 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
 
 void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
                                      RtecScheduler::OS_Priority& priority,
-                                     RtecScheduler::Preemption_Subpriority& p_subpriority,
-                                     RtecScheduler::Preemption_Priority& p_priority,
+                                     RtecScheduler::Preemption_Subpriority_t& p_subpriority,
+                                     RtecScheduler::Preemption_Priority_t& p_priority,
                                      CORBA::Environment &_env)
      TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
@@ -189,8 +189,8 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
 
 void ACE_Config_Scheduler::entry_point_priority (const char * entry_point,
                                                  RtecScheduler::OS_Priority& priority,
-                                                 RtecScheduler::Preemption_Subpriority& p_subpriority,
-                                                 RtecScheduler::Preemption_Priority& p_priority,
+                                                 RtecScheduler::Preemption_Subpriority_t& p_subpriority,
+                                                 RtecScheduler::Preemption_Priority_t& p_priority,
                                                  CORBA::Environment &_env)
      TAO_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
@@ -204,7 +204,7 @@ void ACE_Config_Scheduler::entry_point_priority (const char * entry_point,
 void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                            RtecScheduler::handle_t dependency,
                                            CORBA::Long number_of_calls,
-                                           RtecScheduler::Dependency_Type
+                                           RtecScheduler::Dependency_Type_t
                                              dependency_type,
                                            CORBA::Environment &_env)
      TAO_THROW_SPEC ((CORBA::SystemException,
@@ -410,9 +410,9 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
         new RtecScheduler::Config_Info_Set(impl->minimum_priority_queue () + 1);
     }
   configs->length (impl->minimum_priority_queue () + 1);
-  for (RtecScheduler::Preemption_Priority priority = 0;
+  for (RtecScheduler::Preemption_Priority_t priority = 0;
        priority <= 
-         (RtecScheduler::Preemption_Priority) impl->minimum_priority_queue ();
+         (RtecScheduler::Preemption_Priority_t) impl->minimum_priority_queue ();
        ++priority)
     {
       RtecScheduler::Config_Info* config_info = 0;
@@ -441,9 +441,9 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
 }
 
 
-void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority p_priority,
+void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                    RtecScheduler::OS_Priority& priority,
-				                   RtecScheduler::Dispatching_Type & d_type,
+				                   RtecScheduler::Dispatching_Type_t & d_type,
                                                    CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
@@ -462,14 +462,14 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
   // provide the thread priority and queue type for the given priority level
 
 
-RtecScheduler::Preemption_Priority 
+RtecScheduler::Preemption_Priority_t 
 ACE_Config_Scheduler::last_scheduled_priority (CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
   ACE_UNUSED_ARG (_env);
 
-  RtecScheduler::Preemption_Priority priority = impl->minimum_priority_queue ();
+  RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue ();
 
   if (priority < 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index 58d2084e31a..e25d7e9805e 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -47,22 +47,22 @@ public:
     TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void set (RtecScheduler::handle_t handle,
-                    RtecScheduler::Criticality criticality,
+                    RtecScheduler::Criticality_t criticality,
                     RtecScheduler::Time time,
                     RtecScheduler::Time typical_time,
                     RtecScheduler::Time cached_time,
-                    RtecScheduler::Period period,
-                    RtecScheduler::Importance importance,
-                    RtecScheduler::Quantum quantum,
+                    RtecScheduler::Period_t period,
+                    RtecScheduler::Importance_t importance,
+                    RtecScheduler::Quantum_t quantum,
                     CORBA::Long threads,
-                    RtecScheduler::Info_Type info_type,
+                    RtecScheduler::Info_Type_t info_type,
                     CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& priority,
-                         RtecScheduler::Preemption_Subpriority& p_subpriority,
-                         RtecScheduler::Preemption_Priority& p_priority,
+                         RtecScheduler::Preemption_Subpriority_t& p_subpriority,
+                         RtecScheduler::Preemption_Priority_t& p_priority,
                          CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
@@ -70,8 +70,8 @@ public:
 
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& priority,
-                                     RtecScheduler::Preemption_Subpriority& p_subpriority,
-                                     RtecScheduler::Preemption_Priority& p_priority,
+                                     RtecScheduler::Preemption_Subpriority_t& p_subpriority,
+                                     RtecScheduler::Preemption_Priority_t& p_priority,
                                      CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
@@ -80,7 +80,7 @@ public:
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type dependency_type,
+                               RtecScheduler::Dependency_Type_t dependency_type,
                                CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
@@ -96,16 +96,16 @@ public:
                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
                     RtecScheduler::TASK_COUNT_MISMATCH));
 
-  virtual void dispatch_configuration (RtecScheduler::Preemption_Priority p_priority,
+  virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& priority,
-                                       RtecScheduler::Dispatching_Type & d_type,
+                                       RtecScheduler::Dispatching_Type_t & d_type,
                                        CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // provide the thread priority and queue type for the given priority level
 
-  virtual RtecScheduler::Preemption_Priority last_scheduled_priority (CORBA::Environment &_env)
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (CORBA::Environment &_env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED));
   // Returns the last priority number assigned to an operation in the schedule.
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 54e78eab77a..99f78f2acaa 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -362,8 +362,8 @@ ACE_DynScheduler::get_rt_info (Object_Name name,
 int ACE_DynScheduler::priority (
   const RtecScheduler::handle_t handle,
   RtecScheduler::OS_Priority &priority,
-  RtecScheduler::Preemption_Subpriority &subpriority,
-  RtecScheduler::Preemption_Priority &preemption_prio)
+  RtecScheduler::Preemption_Subpriority_t &subpriority,
+  RtecScheduler::Preemption_Priority_t &preemption_prio)
 {
   // look up the RT_Info that has the given handle
   RT_Info *rt_info = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
index 43f7202a21f..cb6a5fbcff4 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
@@ -49,16 +49,16 @@ public:
 
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
+  typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
   typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Preemption_Subpriority Sub_Priority;
+  typedef RtecScheduler::Preemption_Subpriority_t Sub_Priority;
   typedef RtecScheduler::RT_Info RT_Info;
   typedef RtecScheduler::Config_Info Config_Info;
   typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
-  typedef RtecScheduler::Dispatching_Type Dispatching_Type;
+  typedef RtecScheduler::Period_t Period;
+  typedef RtecScheduler::Info_Type_t Info_Type;
+  typedef RtecScheduler::Dependency_Type_t Dependency_Type;
+  typedef RtecScheduler::Dispatching_Type_t Dispatching_Type;
   typedef RtecScheduler::Scheduling_Anomaly Scheduling_Anomaly;
   typedef RtecScheduler::Anomaly_Severity Anomaly_Severity;
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 4d27b259fa1..42969a1d297 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -702,7 +702,7 @@ Task_Entry_Link::Task_Entry_Link (
   Task_Entry &caller,
   Task_Entry &called,
   CORBA::Long number_of_calls,
-  RtecScheduler::Dependency_Type dependency_type)
+  RtecScheduler::Dependency_Type_t dependency_type)
   : number_of_calls_ (number_of_calls)
   , caller_ (caller)
   , called_ (called)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
index 4928b32a0cd..3c002669ce8 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
@@ -53,14 +53,14 @@ public:
 
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
+  typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
   typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Preemption_Subpriority Sub_Priority;
+  typedef RtecScheduler::Preemption_Subpriority_t Sub_Priority;
   typedef RtecScheduler::RT_Info RT_Info;
   typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
+  typedef RtecScheduler::Period_t Period;
+  typedef RtecScheduler::Info_Type_t Info_Type;
+  typedef RtecScheduler::Dependency_Type_t Dependency_Type;
 
   Dispatch_Entry_Link (Dispatch_Entry &d);
     // Constructor.
@@ -97,14 +97,14 @@ public:
 
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
+  typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
   typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Preemption_Subpriority Sub_Priority;
+  typedef RtecScheduler::Preemption_Subpriority_t Sub_Priority;
   typedef RtecScheduler::RT_Info RT_Info;
   typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
+  typedef RtecScheduler::Period_t Period;
+  typedef RtecScheduler::Info_Type_t Info_Type;
+  typedef RtecScheduler::Dependency_Type_t Dependency_Type;
 
   // Info for DFS traversal, topological sort of call graph.
   enum DFS_Status {NOT_VISITED, VISITED, FINISHED};
@@ -297,14 +297,14 @@ public:
 
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
+  typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
   typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Preemption_Subpriority Sub_Priority;
+  typedef RtecScheduler::Preemption_Subpriority_t Sub_Priority;
   typedef RtecScheduler::RT_Info RT_Info;
   typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
+  typedef RtecScheduler::Period_t Period;
+  typedef RtecScheduler::Info_Type_t Info_Type;
+  typedef RtecScheduler::Dependency_Type_t Dependency_Type;
 
   // ctor
   Task_Entry_Link (Task_Entry &caller,
@@ -352,14 +352,14 @@ public:
 
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
+  typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
   typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Preemption_Subpriority Sub_Priority;
+  typedef RtecScheduler::Preemption_Subpriority_t Sub_Priority;
   typedef RtecScheduler::RT_Info RT_Info;
   typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
+  typedef RtecScheduler::Period_t Period;
+  typedef RtecScheduler::Info_Type_t Info_Type;
+  typedef RtecScheduler::Dependency_Type_t Dependency_Type;
 
   typedef u_long Dispatch_Id;
 
@@ -463,14 +463,14 @@ public:
 
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
+  typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
   typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Preemption_Subpriority Sub_Priority;
+  typedef RtecScheduler::Preemption_Subpriority_t Sub_Priority;
   typedef RtecScheduler::RT_Info RT_Info;
   typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
+  typedef RtecScheduler::Period_t Period;
+  typedef RtecScheduler::Info_Type_t Info_Type;
+  typedef RtecScheduler::Dependency_Type_t Dependency_Type;
 
   Dispatch_Proxy_Iterator (ACE_Ordered_MultiSet <Dispatch_Entry_Link> &set,
                            u_long actual_frame_size,
@@ -552,14 +552,14 @@ public:
 
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
+  typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
   typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Preemption_Subpriority Sub_Priority;
+  typedef RtecScheduler::Preemption_Subpriority_t Sub_Priority;
   typedef RtecScheduler::RT_Info RT_Info;
   typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
+  typedef RtecScheduler::Period_t Period;
+  typedef RtecScheduler::Info_Type_t Info_Type;
+  typedef RtecScheduler::Dependency_Type_t Dependency_Type;
 
   // time slice constructor
   TimeLine_Entry (Dispatch_Entry &dispatch_entry,
@@ -610,14 +610,14 @@ public:
 
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
+  typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
   typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Preemption_Subpriority Sub_Priority;
+  typedef RtecScheduler::Preemption_Subpriority_t Sub_Priority;
   typedef RtecScheduler::RT_Info RT_Info;
   typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
+  typedef RtecScheduler::Period_t Period;
+  typedef RtecScheduler::Info_Type_t Info_Type;
+  typedef RtecScheduler::Dependency_Type_t Dependency_Type;
 
   TimeLine_Entry_Link  (TimeLine_Entry &t);
   // ctor
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
index e95db5677c8..1923fe7cd7f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
@@ -48,13 +48,13 @@ public:
 
   typedef RtecScheduler::handle_t handle_t;
   typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
+  typedef RtecScheduler::Preemption_Priority_t Preemption_Priority;
   typedef RtecScheduler::OS_Priority OS_Thread_Priority;
-  typedef RtecScheduler::Preemption_Subpriority Sub_Priority;
+  typedef RtecScheduler::Preemption_Subpriority_t Sub_Priority;
   typedef RtecScheduler::RT_Info RT_Info;
   typedef RtecScheduler::Config_Info Config_Info;
   typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Dispatching_Type Dispatching_Type;
+  typedef RtecScheduler::Dispatching_Type_t Dispatching_Type;
   typedef RtecScheduler::Scheduling_Anomaly Scheduling_Anomaly;
 
   // Map some types to simplify re-use.
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index 41f5c1330b3..963f3102203 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -584,7 +584,7 @@ ACE_Strategy_Scheduler::schedule_timeline_entry (
 ////////////////////////////////////////////////////////////////////
 
 template <class STRATEGY> ACE_Strategy_Scheduler *
-ACE_Strategy_Scheduler_Factory<STRATEGY>::create (RtecScheduler::Preemption_Priority minimum_critical_priority)
+ACE_Strategy_Scheduler_Factory<STRATEGY>::create (RtecScheduler::Preemption_Priority_t minimum_critical_priority)
 {
   ACE_Strategy_Scheduler *the_scheduler = 0;
   STRATEGY *the_strategy;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index b5d0b87ab03..20735e65cb9 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -97,7 +97,7 @@ class ACE_Strategy_Scheduler_Factory
 {
 public:
 
-        static ACE_Strategy_Scheduler * create (RtecScheduler::Preemption_Priority minimum_critical_priority);
+        static ACE_Strategy_Scheduler * create (RtecScheduler::Preemption_Priority_t minimum_critical_priority);
     // construct and return a scheduler strategized with
     // an instance of the the parameterized strategy type
 };
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index cf83be128c4..6db1cf63b9e 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -33,7 +33,7 @@ struct ACE_Scheduler_Factory_Data
   ACE_Runtime_Scheduler scheduler_;
   // The static runtime scheduler.
 
-  ACE_TSS<ACE_TSS_Type_Adapter<RtecScheduler::Preemption_Priority> >
+  ACE_TSS<ACE_TSS_Type_Adapter<RtecScheduler::Preemption_Priority_t> >
     preemption_priority_;
   // The dispatch queue number of the calling thread.  For access by
   // applications; must be set by either the application or Event
@@ -375,14 +375,14 @@ int ACE_Scheduler_Factory::dump_schedule
   typedef CORBA::Long RtecScheduler_Preemption_Priority;
 #endif /* HPUX && !g++ */
 
-RtecScheduler::Preemption_Priority
+RtecScheduler::Preemption_Priority_t
 ACE_Scheduler_Factory::preemption_priority ()
 {
   // Return whatever we've got.  The application or Event Channel is
   // responsible for making sure that it was set.
   if (ace_scheduler_factory_data->preemption_priority_.ts_object ())
     {
-      ACE_TSS_Type_Adapter<RtecScheduler::Preemption_Priority> *tss =
+      ACE_TSS_Type_Adapter<RtecScheduler::Preemption_Priority_t> *tss =
         ace_scheduler_factory_data->preemption_priority_;
       // egcs 1.0.1 raises an internal compiler error if we implicitly
       // call the type conversion operator.  So, call it explicitly.
@@ -391,19 +391,19 @@ ACE_Scheduler_Factory::preemption_priority ()
         ACE_static_cast (RtecScheduler::Preemption_Priority,
                          tss->operator RtecScheduler_Preemption_Priority ());
 #else
-      const RtecScheduler::Preemption_Priority preemption_priority =
-        ACE_static_cast (RtecScheduler::Preemption_Priority,
-                         tss->operator RtecScheduler::Preemption_Priority ());
+      const RtecScheduler::Preemption_Priority_t preemption_priority =
+        ACE_static_cast (RtecScheduler::Preemption_Priority_t,
+                         tss->operator RtecScheduler::Preemption_Priority_t ());
 #endif /* HPUX && !g++ */
       return preemption_priority;
     }
   else
-    return ACE_static_cast (RtecScheduler::Preemption_Priority, -1);
+    return ACE_static_cast (RtecScheduler::Preemption_Priority_t, -1);
 }
 
 void
 ACE_Scheduler_Factory::set_preemption_priority
-  (const RtecScheduler::Preemption_Priority preemption_priority)
+  (const RtecScheduler::Preemption_Priority_t preemption_priority)
 {
   // Probably don't need this, because it should be safe to assume
   // that static_server () was called before this function.  But just
@@ -417,9 +417,9 @@ ACE_Scheduler_Factory::set_preemption_priority
   ace_scheduler_factory_data->preemption_priority_->
 #if defined (HPUX) && !defined (__GNUG__)
     // aCC can't handle the typedef.
-    operator RtecScheduler_Preemption_Priority & () = preemption_priority;
+    operator RtecScheduler_Preemption_Priority_t & () = preemption_priority;
 #else
-    operator RtecScheduler::Preemption_Priority & () = preemption_priority;
+    operator RtecScheduler::Preemption_Priority_t & () = preemption_priority;
 #endif /* HPUX && !g++ */
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index 688f4360dd0..0f3cb349b0a 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -46,14 +46,14 @@ public:
     RtecScheduler::Time worst_case_execution_time;
     RtecScheduler::Time typical_execution_time;
     RtecScheduler::Time cached_execution_time;
-    RtecScheduler::Period period;
+    RtecScheduler::Period_t period;
     CORBA::Long criticality;
     CORBA::Long importance;
-    RtecScheduler::Quantum quantum;
+    RtecScheduler::Quantum_t quantum;
     CORBA::Long threads;
     RtecScheduler::OS_Priority priority;
-    RtecScheduler::Preemption_Subpriority static_subpriority;
-    RtecScheduler::Preemption_Priority preemption_priority;
+    RtecScheduler::Preemption_Subpriority_t static_subpriority;
+    RtecScheduler::Preemption_Priority_t preemption_priority;
     CORBA::Long info_type;
   };
 
@@ -68,9 +68,9 @@ public:
         //   array index match the preemption priority stored in the config info
         //   at that index: this is used to detect uninitialized/corrupted schedules
   {
-    RtecScheduler::Preemption_Priority preemption_priority;
+    RtecScheduler::Preemption_Priority_t preemption_priority;
     RtecScheduler::OS_Priority thread_priority;
-    RtecScheduler::Dispatching_Type dispatching_type;
+    RtecScheduler::Dispatching_Type_t dispatching_type;
   };
 
     struct POD_Scheduling_Anomaly
@@ -129,12 +129,12 @@ public:
   // factory is uninitialized, or in a config or runtime mode of operation.
 
   // = Access the (OS independent) preemption priority of the calling thread.
-  static RtecScheduler::Preemption_Priority preemption_priority ();
+  static RtecScheduler::Preemption_Priority_t preemption_priority ();
   // Returns (u_int) -1 if the preemption priority hadn't been set.
 
   // = Set the (OS independent) preemption priority of the calling thread.
   static void set_preemption_priority
-    (const RtecScheduler::Preemption_Priority);
+    (const RtecScheduler::Preemption_Priority_t);
   // The application or Event Channel is responsible for making sure
   // that the preemption priority is set before any access of the
   // preemption priority.
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
index becd59c0c64..7ca8999c8fc 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
@@ -33,9 +33,9 @@ public:
                RtecScheduler::Time worst_time,
                RtecScheduler::Time typical_time,
                RtecScheduler::Time cached_time,
-               RtecScheduler::Period period,
-               RtecScheduler::Importance importance,
-               RtecScheduler::Quantum quantum,
+               RtecScheduler::Period_t period,
+               RtecScheduler::Importance_t importance,
+               RtecScheduler::Quantum_t quantum,
                CORBA::Long threads);
 
   ACE_RT_Info (const RtecScheduler::RT_Info& rt_info);
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.i b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.i
index 1d62ceffaf5..b57843134ea 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.i
@@ -9,9 +9,9 @@ ACE_RT_Info::ACE_RT_Info (const char* entry_point_,
 			  RtecScheduler::Time worst_time_,
 			  RtecScheduler::Time typical_time_,
 			  RtecScheduler::Time cached_time_,
-			  RtecScheduler::Period period_,
-			  RtecScheduler::Importance importance_,
-			  RtecScheduler::Quantum quantum_,
+			  RtecScheduler::Period_t period_,
+			  RtecScheduler::Importance_t importance_,
+			  RtecScheduler::Quantum_t quantum_,
 			  CORBA::Long threads_)
 {
   this->entry_point = entry_point_;