Mon Dec 3 13:49:18 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

63 files changed, 188 insertions, 114 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ece48a99bec..9b25231b120 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,72 @@
+Mon Dec  3 13:49:18 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * examples/CSD_Strategy/ThreadPool2/FooServantList.h:
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool5/FooServantList.h:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.h:
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h:
+        * orbsvcs/Fault_Notifier/FT_Notifier_i.h:
+        * orbsvcs/examples/LoadBalancing/RPS_Monitor.h:
+        * orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp:
+        * orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h:
+        * orbsvcs/examples/Notify/Federation/Gate/Gate.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp:
+        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.h:
+        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp:
+        * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h:
+        * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp:
+        * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h:
+        * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp:
+        * orbsvcs/orbsvcs/Notify/Random_File.h:
+        * orbsvcs/orbsvcs/Notify/Random_File.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp:
+        * orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h:
+        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h:
+        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp:
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h:
+        * performance-tests/CSD_Strategy/TestInf/AppShutdown.h:
+        * performance-tests/CSD_Strategy/TestInf/ClientEngine.h:
+        * performance-tests/CSD_Strategy/TestInf/ClientTask.h:
+        * performance-tests/RTCorba/Thread_Pool/client.cpp:
+        * tests/Big_Oneways/Session.h:
+        * tests/Big_Oneways/Session.cpp:
+        * tests/Big_Oneways/Session_Control.h:
+        * tests/Big_Oneways/Session_Control.cpp:
+        * tests/Big_Twoways/Session.h:
+        * tests/Big_Twoways/Session.cpp:
+        * tests/Big_Twoways/Session_Control.h:
+        * tests/Big_Twoways/Session_Control.cpp:
+        * tests/Bug_1020_Basic_Regression/Echo.h:
+        * tests/Bug_1020_Basic_Regression/Echo.cpp:
+        * tests/Bug_1361_Regression/Echo.h:
+        * tests/Bug_2805_Regression/client.cpp:
+        * tests/Bug_2909_Regression/client.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h:
+        * tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Common/ClientTask.h:
+        * tests/MT_BiDir/Receiver_i.cpp:
+        * tests/MT_BiDir/Sender_i.cpp:
+        * tests/Muxed_GIOP_Versions/server.cpp:
+        * tests/Muxing/Receiver.h:
+        * tests/Muxing/Receiver.cpp:
+        * tests/Stack_Recursion/Sender.h:
+        * tests/Stack_Recursion/Sender.cpp:
+
+          Parts of TAO use TAO_SYNCH_MUTEX while other parts use ACE_SYNCH_MUTEX.
+          All occurrences of ACE_SYNCH_MUTEX were replaced with TAO_SYNCH_MUTEX for
+          consistency.
+
 Sun Dec  2 16:10:32 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
index c07350e07b4..3fd17c54093 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
@@ -25,7 +25,7 @@ class FooServantList
 
   private:
 
-    typedef ACE_SYNCH_MUTEX     LockType;
+    typedef TAO_SYNCH_MUTEX     LockType;
     typedef ACE_Guard<LockType> GuardType;
 
     PortableServer::ServantBase_var* servants_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
index 56d95507f92..5f1027a568d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
@@ -227,7 +227,7 @@ Foo_i::test_callback (
 void
 Foo_i::done(void)
 {
-  static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned> num_clients = 2;
+  static ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients = 2;
 
   num_clients --;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
index 8a3f6dd3c3f..d0ae86d7373 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
@@ -33,7 +33,7 @@ class FooServantList
 
   private:
 
-    typedef ACE_SYNCH_MUTEX     LockType;
+    typedef TAO_SYNCH_MUTEX     LockType;
     typedef ACE_Guard<LockType> GuardType;
 
     Foo_i** servants_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
index 5173fa40f6e..ab3ad761965 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
@@ -86,9 +86,9 @@ class Foo_i : public virtual POA_Foo
 
   private:
 
-    typedef ACE_Atomic_Op <ACE_SYNCH_MUTEX, CORBA::Long> AtomicLong;
-    typedef ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned> AtomicUnsigned;
-    typedef ACE_Atomic_Op <ACE_SYNCH_MUTEX, bool> AtomicBool;
+    typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> AtomicLong;
+    typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> AtomicUnsigned;
+    typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> AtomicBool;
 
     AtomicLong value_;
     AtomicUnsigned count_op1_;
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index 289fc1ae775..8fc5a11b2bf 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -207,8 +207,8 @@ namespace TAO
      * Implementation methods should assume the mutex is
      * locked if necessary.
      */
-    ACE_SYNCH_MUTEX internals_;
-    typedef ACE_Guard<ACE_SYNCH_MUTEX> InternalGuard;
+    TAO_SYNCH_MUTEX internals_;
+    typedef ACE_Guard<TAO_SYNCH_MUTEX> InternalGuard;
 
     /**
      * The orb
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index cfffe13aec6..fad9523fb34 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -149,8 +149,8 @@ namespace TAO
      * Implementation methods should assume the mutex is
      * locked if necessary.
      */
-    ACE_SYNCH_MUTEX internals_;
-    typedef ACE_Guard<ACE_SYNCH_MUTEX> InternalGuard;
+    TAO_SYNCH_MUTEX internals_;
+    typedef ACE_Guard<TAO_SYNCH_MUTEX> InternalGuard;
 
     /**
      * The orb
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
index 834a34cb8bd..fef78a9b20a 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
@@ -53,7 +53,7 @@ RPS_Monitor::loads (void)
   ACE_Time_Value elapsed_time;
 
   {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->lock_, 0);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, monitor, this->lock_, 0);
 
     elapsed_time = current_time - this->last_time_;
     this->last_time_ = current_time;
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
index 2c81309da6e..ecb6dd500a4 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
@@ -81,7 +81,7 @@ private:
 
   ACE_Time_Value last_time_;
 
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
index 80f1b2ab4ba..74cb2fd2228 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
@@ -95,7 +95,7 @@ protected:
 private:
 
   /// The number of requests that have arrived on the server.
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> request_count_;
+  ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> request_count_;
 
 };
 
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
index ff05025cf66..891bb16d0f9 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
@@ -75,7 +75,7 @@ private:
   ACE_RMCast::Socket socket_;
   CORBA::String_var id_;
 
-  typedef ACE_SYNCH_MUTEX Mutex;
+  typedef TAO_SYNCH_MUTEX Mutex;
   typedef ACE_Guard<Mutex> Lock;
 
   bool stop_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index 962a359017e..1137af088b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -41,7 +41,7 @@ TAO_EC_TPC_Dispatching::~TAO_EC_TPC_Dispatching ()
 int
 TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
   // Duplicate the pointer and hold it safely
   RtecEventComm::PushConsumer_var pc =
@@ -97,7 +97,7 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer)
 int
 TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consumer)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
   TAO_EC_Dispatching_Task* dtask = 0;
 
@@ -131,7 +131,7 @@ TAO_EC_TPC_Dispatching::activate (void)
 void
 TAO_EC_TPC_Dispatching::shutdown (void)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   // The MT_Dispatching strategy sends a TAO_EC_Shutdown_Task_Command
   // to the dispatching task.  Is that what we should do here?
@@ -183,7 +183,7 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
   if (TAO_EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer));
 
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   TAO_EC_Dispatching_Task* dtask;
 
   if (this->consumer_task_map_.find (consumer, dtask) == -1)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
index b7ece85cb30..89b1cfbb81b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
@@ -88,7 +88,7 @@ private:
   // Lock for modifying the map.  It's not enough to have a lock only
   // on the map, because we have to hold the map constant while doing
   // multiple distinct map manipulations, such as in remove_consumer().
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
 
   // Service object information
   TAO_EC_Queue_Full_Service_Object* queue_full_service_object_;  // @@ who will release?
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index 6d8c87e0ec5..bb186614eb8 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -37,7 +37,7 @@ namespace TAO
 
     // Would be nice to have runtime option.
     ACE_NEW (this->lock_,
-             ACE_Lock_Adapter<ACE_SYNCH_MUTEX>);
+             ACE_Lock_Adapter<TAO_SYNCH_MUTEX>);
 
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index c362d5f67c9..a841cdb2b07 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -41,7 +41,7 @@ public:
     void get_state(FtRtecEventChannelAdmin::CachedOptionResults& state);
     void set_state(const FtRtecEventChannelAdmin::CachedOptionResults& state);
 private:
-   typedef ACE_Hash_Map_Manager<ACE_CString, CachedRequestInfo, ACE_SYNCH_MUTEX> TableImpl;
+   typedef ACE_Hash_Map_Manager<ACE_CString, CachedRequestInfo, TAO_SYNCH_MUTEX> TableImpl;
    TableImpl table_;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
index d21db5c3fa8..aac9b9dad39 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -41,7 +41,7 @@ public:
   };
 
   typedef auto_ptr<Info> Info_ptr;
-  friend class ACE_Singleton<GroupInfoPublisherBase, ACE_SYNCH_MUTEX>;
+  friend class ACE_Singleton<GroupInfoPublisherBase, TAO_SYNCH_MUTEX>;
 
   void subscribe(TAO_FTEC_Become_Primary_Listener* listener);
   void set_naming_context(CosNaming::NamingContext_var naming_context);
@@ -75,7 +75,7 @@ private:
   Info_ptr info_;
 };
 
-typedef ACE_Singleton<GroupInfoPublisherBase, ACE_SYNCH_MUTEX> GroupInfoPublisher;
+typedef ACE_Singleton<GroupInfoPublisherBase, TAO_SYNCH_MUTEX> GroupInfoPublisher;
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
index d1938c74516..9e8d3df836d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -40,7 +40,7 @@ public:
   virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder);
 private:
   ACE_Auto_Event& evt_;
-  ACE_Atomic_Op< ACE_SYNCH_MUTEX, int > num_backups_;
+  ACE_Atomic_Op< TAO_SYNCH_MUTEX, int > num_backups_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
index c207baefd16..63ed805a07a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
@@ -30,7 +30,7 @@ Update_Manager::~Update_Manager()
 
 void Update_Manager::handle_reply(int id)
 {
-  ACE_Guard<ACE_SYNCH_MUTEX> guard(mutex_);
+  ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex_);
   replied_[id] = true;
 
   if ((replied_ & signal_condition_) == signal_condition_) {
@@ -43,7 +43,7 @@ void Update_Manager::handle_reply(int id)
 
 void Update_Manager::handle_exception(int id)
 {
-  ACE_Guard<ACE_SYNCH_MUTEX> guard(mutex_);
+  ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex_);
   replied_[id] = true;
   ++transaction_level_;
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
index caacd63fffe..2fed0651215 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
@@ -15,6 +15,7 @@
 
 #include "ace/Synch_T.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -44,7 +45,7 @@ private:
   int num_backups_;
   int transaction_level_;
   bool& success_;
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index d528161d9da..90c4b945a24 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -55,7 +55,7 @@ TAO_Notify_Buffering_Strategy::update_qos_properties
 void
 TAO_Notify_Buffering_Strategy::shutdown (void)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_);
 
   if (this->shutdown_)
   {
@@ -75,7 +75,7 @@ TAO_Notify_Buffering_Strategy::oldest_event (void)
   ACE_Time_Value tv (ACE_Time_Value::max_time);
   ACE_Message_Block* mb = 0;
 
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, tv);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, tv);
   TAO_Notify_Message_Queue::ITERATOR itr (this->msg_queue_);
   while(itr.next (mb))
     {
@@ -96,7 +96,7 @@ TAO_Notify_Buffering_Strategy::oldest_event (void)
 int
 TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable* method_request)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
 
   if (this->shutdown_)
     return -1;
@@ -168,7 +168,7 @@ TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request_Queueable* &me
 {
   ACE_Message_Block *mb;
 
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
 
   if ( this->shutdown_ )
     return -1;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
index 7b3b9b65e46..354832931d2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
@@ -89,7 +89,7 @@ private:
   TAO_Notify_AdminProperties::Ptr admin_properties_;
 
   /// The shared global lock used by all the queues.
-  ACE_SYNCH_MUTEX& global_queue_lock_;
+  TAO_SYNCH_MUTEX& global_queue_lock_;
 
   /// The global queue length - queue length accross all the queues.
   CORBA::Long& global_queue_length_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
index 5a9ccfb368c..fa15e522f78 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
@@ -19,7 +19,7 @@ TAO_MonitorManager::TAO_MonitorManager (void)
 int
 TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[])
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
   this->task_.argv_.add ("fake_process_name");
 
   ACE_Get_Opt opts (argc, argv, ACE_TEXT ("o:"), 0, 0,
@@ -63,7 +63,7 @@ TAO_MonitorManager::fini (void)
 {
   if (!CORBA::is_nil (this->task_.orb_.in ()))
     {
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
       if (!CORBA::is_nil (this->task_.orb_.in ())) {
         this->task_.orb_->shutdown (true);
       }
@@ -78,7 +78,7 @@ TAO_MonitorManager::run (void)
   bool activate = false;
 
   {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
 
     // Work around for bug 3108. Need to create MC ORB in main thread
     // so any libs are loaded in the parent thread.
@@ -144,7 +144,7 @@ TAO_MonitorManager::ORBTask::svc (void)
 
       PortableServer::POA_var poa;
       {
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->mutex_, -1);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->mutex_, -1);
 
         CORBA::Object_var obj =
           this->orb_->resolve_initial_references ("RootPOA");
@@ -214,7 +214,7 @@ TAO_MonitorManager::ORBTask::svc (void)
       startup_barrier_.wait ();
       this->orb_->run ();
 
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->mutex_, -1);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->mutex_, -1);
 
       // Destroy the POA and ORB
       if (!CORBA::is_nil (poa.in ()))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
index 920c00b106f..699e513e311 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
@@ -42,7 +42,7 @@ private:
     ORBTask (void);
     virtual int svc (void);
 
-    ACE_SYNCH_MUTEX mutex_;
+    TAO_SYNCH_MUTEX mutex_;
     ACE_ARGV_T<char> argv_;
     CORBA::ORB_var orb_;
     ACE_TString ior_output_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
index a03960b3607..00a36bb6797 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
@@ -161,7 +161,7 @@ Persistent_File_Allocator::allocate()
 {
   Persistent_Storage_Block* result = 0;
   size_t block_number = 0;
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
   if (!this->allocate_block(block_number))
   {
     //@@todo: this should never happen
@@ -207,7 +207,7 @@ Persistent_File_Allocator::allocate_nowrite()
 void
 Persistent_File_Allocator::used(size_t block_number)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_);
   if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Persistent_File_Allocator::used: %d\n"),
     static_cast<int> (block_number)
@@ -242,7 +242,7 @@ Persistent_File_Allocator::read(Persistent_Storage_Block* psb)
   {
     Persistent_Storage_Block** psbtemp = 0;
     {
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_, false);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_, false);
       size_t queue_size = this->block_queue_.size();
       for (size_t idx = 0; !cached && (idx < queue_size); ++idx)
       {
@@ -284,7 +284,7 @@ Persistent_File_Allocator::write(Persistent_Storage_Block* psb)
       ACE_NEW_RETURN(ourpsb, Persistent_Storage_Block(*psb), false);
       ourpsb->set_allocator_owns(true);
     }
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_, false);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_, false);
     if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
       ACE_TEXT ("(%P|%t) Queueing PSB to write block %d\n")
       , static_cast<int> (psb->block_number ())
@@ -298,7 +298,7 @@ Persistent_File_Allocator::write(Persistent_Storage_Block* psb)
 void
 Persistent_File_Allocator::free_block(const size_t block_number)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_);
   ACE_ASSERT (this->free_blocks_.is_set (block_number));
   this->free_blocks_.set_bit(block_number, false);
 }
@@ -306,7 +306,7 @@ Persistent_File_Allocator::free_block(const size_t block_number)
 bool
 Persistent_File_Allocator::allocate_block(size_t& block_number)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_, 0);
   block_number = this->free_blocks_.find_first_bit(false);
   return true;
 }
@@ -331,7 +331,7 @@ Persistent_File_Allocator::shutdown_thread()
   if (this->thread_active_)
   {
     {
-      ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_);
+      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_);
       this->terminate_thread_ = true;
       this->wake_up_thread_.signal();
     }
@@ -352,7 +352,7 @@ Persistent_File_Allocator::run()
     do_more_work = false;
     Persistent_Storage_Block * blk = 0;
     {
-      ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_);
+      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_);
       while (this->block_queue_.is_empty() && !terminate_thread_)
       {
         this->wake_up_thread_.wait();
@@ -374,7 +374,7 @@ Persistent_File_Allocator::run()
       }
       {
         Persistent_Storage_Block * blk2 = 0;
-        ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_);
+        ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_);
         this->block_queue_.dequeue_head (blk2);
         // if this triggers, someone pushed onto the head of the queue
         // or removed the head from the queue without telling ME.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
index db17d13a6cc..79927baa234 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
@@ -192,9 +192,9 @@ private:
   Random_File pstore_;
   Bit_Vector free_blocks_;
   ACE_Unbounded_Queue<Persistent_Storage_Block*> block_queue_;
-  ACE_SYNCH_MUTEX lock_;
-  ACE_SYNCH_MUTEX free_blocks_lock_;
-  ACE_SYNCH_MUTEX queue_lock_;
+  TAO_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX free_blocks_lock_;
+  TAO_SYNCH_MUTEX queue_lock_;
   bool terminate_thread_;
   bool thread_active_;
   ACE_SYNCH_CONDITION wake_up_thread_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
index a106d15f382..5b1c6f1c230 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
@@ -35,7 +35,7 @@ ACE_OFF_T
 Random_File::size() const
 {
   Random_File * const mutable_this = const_cast<Random_File *> (this);
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
   ACE_OFF_T original_pos = mutable_this->tell ();
   mutable_this->ACE_FILE::seek(0, SEEK_END);
   ACE_OFF_T cursize = mutable_this->tell();
@@ -50,7 +50,7 @@ Random_File::size() const
 bool
 Random_File::open(const ACE_TCHAR* filename, size_t block_size)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, false);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, false);
   this->block_size_ = block_size;
   bool result = (this->close() == 0);
 
@@ -87,7 +87,7 @@ Random_File::open(const ACE_TCHAR* filename, size_t block_size)
 bool
 Random_File::write(const size_t block_number, void* buf, bool atomic)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, false);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, false);
   if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Write block %d %c\n"),
     static_cast<int> (block_number),
@@ -122,7 +122,7 @@ Random_File::write(const size_t block_number, void* buf, bool atomic)
 bool
 Random_File::read(const size_t block_number, void* buf)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, false);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, false);
   if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Read block %d\n"),
     static_cast<int> (block_number)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
index 87a5513ac50..0f197c6dceb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
@@ -28,6 +28,8 @@
 #include "ace/streams.h"
 #include "ace/Synch_T.h"
 
+#include "tao/orbconf.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
@@ -83,7 +85,7 @@ private:
 
 private:
   size_t block_size_;
-  mutable ACE_SYNCH_MUTEX lock_;
+  mutable TAO_SYNCH_MUTEX lock_;
 };
 
 } /* namespace TAO_Notify */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
index 75b64de8f05..d669f2dde34 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
@@ -43,7 +43,7 @@ Routing_Slip_Persistence_Manager::~Routing_Slip_Persistence_Manager()
 void
 Routing_Slip_Persistence_Manager::set_callback(Persistent_Callback* callback)
 {
-  ACE_GUARD(ACE_SYNCH_MUTEX, ace_mon, this->lock_);
+  ACE_GUARD(TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->callback_ = callback;
 }
 
@@ -73,7 +73,7 @@ Routing_Slip_Persistence_Manager::store_root()
   versioninfo.wr_ptr()[0] = 1; // Major version number
   versioninfo.wr_ptr()[1] = 0; // Minor version number
   versioninfo.wr_ptr(2);
-  ACE_GUARD_RETURN(ACE_SYNCH_MUTEX, ace_mon, this->lock_, result);
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, ace_mon, this->lock_, result);
   result = this->build_chain(this->first_routing_slip_block_,
     this->routing_slip_header_, this->allocated_routing_slip_blocks_,
     versioninfo);
@@ -204,7 +204,7 @@ Routing_Slip_Persistence_Manager::store(const ACE_Message_Block& event,
   const ACE_Message_Block& routing_slip)
 {
   bool result = false;
-  ACE_GUARD_RETURN(ACE_SYNCH_MUTEX, ace_mon, this->lock_, result);
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, ace_mon, this->lock_, result);
   if (!this->removed_)
   {
     result = store_i(event, routing_slip);
@@ -216,7 +216,7 @@ bool
 Routing_Slip_Persistence_Manager::update(const ACE_Message_Block& routing_slip)
 {
   bool result = false;
-  ACE_GUARD_RETURN(ACE_SYNCH_MUTEX, ace_mon, this->lock_, result);
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, ace_mon, this->lock_, result);
   // If we have not gotten the event yet or we have no allocator, fail
   if (!this->removed_)
   {
@@ -232,7 +232,7 @@ bool
 Routing_Slip_Persistence_Manager::remove()
 {
   bool result = false;
-  ACE_GUARD_RETURN(ACE_SYNCH_MUTEX, ace_mon, this->lock_, result);
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, ace_mon, this->lock_, result);
   // Assert that this is in the dllist
   ACE_ASSERT(this->prev_manager_ != this);
   ACE_ASSERT(this->persisted());
@@ -702,7 +702,7 @@ Routing_Slip_Persistence_Manager::update_next_manager(
   Routing_Slip_Persistence_Manager* next)
 {
   bool result = false;
-  ACE_GUARD_RETURN(ACE_SYNCH_MUTEX, ace_mon, this->lock_, result);
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, ace_mon, this->lock_, result);
   ACE_ASSERT(this->persisted());
   if (!this->removed_)
   {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
index 0704a315884..6cd9014632a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
@@ -25,6 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Versioned_Namespace.h"
+#include "tao/orbconf.h"
 #include "ace/Message_Block.h"
 #include "ace/Synch_T.h"
 #include "ace/Containers_T.h"
@@ -238,7 +239,7 @@ private:
   void remove_from_dllist();
 
 private:
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
   bool removed_;
   ACE_UINT64 serial_number_;
   Persistent_File_Allocator* allocator_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h
index 995577d761a..40870c9e126 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h
@@ -86,7 +86,7 @@ namespace TAO_Notify
     Routing_Slip_Persistence_Manager & root();
 
   public:
-    ACE_SYNCH_MUTEX lock;
+    TAO_SYNCH_MUTEX lock;
 
   private:
     Persistent_File_Allocator allocator_;
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 50531374cbd..269eb9c09e8 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -102,7 +102,7 @@ struct ACE_Scheduler_Factory_Data
   // The static runtime scheduler.
 */
 
-  TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> scheduler_;
+  TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> scheduler_;
   // The scheduler.
 
   ACE_TSS<ACE_TSS_Type_Adapter<RtecScheduler::Preemption_Priority_t> >
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
index c09321b0d7b..686a1545115 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
@@ -52,7 +52,7 @@ RPS_Monitor::loads (void)
   ACE_Time_Value elapsed_time;
 
   {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->lock_, 0);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, monitor, this->lock_, 0);
 
     elapsed_time = current_time - this->last_time_;
     this->last_time_ = current_time;
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
index 7825b5e5e67..d0b4b5565f7 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
@@ -80,7 +80,7 @@ private:
 
   ACE_Time_Value last_time_;
 
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
index 2e3fe2247a5..bbcd23168c9 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
@@ -94,7 +94,7 @@ protected:
 private:
 
   /// The number of requests that have arrived on the server.
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> request_count_;
+  ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> request_count_;
 
 };
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
index 8c36cbd0349..ee18997a132 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
@@ -13,6 +13,7 @@
 #include "ace/Task.h"
 #include "ace/Barrier.h"
 #include "ace/OS_NS_unistd.h"
+#include "tao/orbconf.h"
 
 ACE_RCSID (TAO_RTEC_PERF_TCP_Baseline,
            client,
@@ -39,7 +40,7 @@ private:
   char const * endpoint_;
   ACE_Barrier * the_barrier_;
   int period_in_usecs_;
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
   int stopped_;
 };
 
@@ -135,7 +136,7 @@ Scavenger_Task::Scavenger_Task(char const * endpoint,
 void
 Scavenger_Task::stop(void)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->stopped_ = 1;
 }
 
@@ -163,7 +164,7 @@ Scavenger_Task::svc(void)
       ACE_OS::sleep (period);
 
       {
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
         if (this->stopped_)
           break;
       }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index 4d04baba07e..627bc9ceec4 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -160,8 +160,8 @@ private:
    * Implementation methods should assume the mutex is
    * locked if necessary.
    */
-  ACE_SYNCH_MUTEX internals_;
-  typedef ACE_Guard<ACE_SYNCH_MUTEX> InternalGuard;
+  TAO_SYNCH_MUTEX internals_;
+  typedef ACE_Guard<TAO_SYNCH_MUTEX> InternalGuard;
 
   /**
    * The orb
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
index 7249def17bf..eee1be40ac1 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
@@ -24,7 +24,7 @@ class CSD_PT_TestInf_Export AppShutdown
 
   private:
 
-    typedef ACE_SYNCH_MUTEX LockType;
+    typedef TAO_SYNCH_MUTEX LockType;
     typedef ACE_Guard<LockType> GuardType;
 
     LockType lock_;
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h
index 63f34fd4f76..447fd230557 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h
@@ -25,7 +25,7 @@ class ClientEngine;
 typedef TAO_Intrusive_Ref_Count_Handle<ClientEngine> ClientEngine_Handle;
 
 
-class CSD_PT_TestInf_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX>
+class CSD_PT_TestInf_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX>
 {
   public:
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h
index a99ccc6ad43..d7c8ce5a488 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h
@@ -39,7 +39,7 @@ class CSD_PT_TestInf_Export ClientTask : public ACE_Task_Base
 
   private:
 
-     typedef ACE_SYNCH_MUTEX     LockType;
+     typedef TAO_SYNCH_MUTEX     LockType;
      typedef ACE_Guard<LockType> GuardType;
 
      typedef ACE_Vector<ClientEngine_Handle> EngineVector;
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index b77e2d7eea2..7a7747e763a 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -56,7 +56,7 @@ struct Synchronizers
   {
   }
 
-  ACE_SYNCH_MUTEX worker_lock_;
+  TAO_SYNCH_MUTEX worker_lock_;
   ACE_Event workers_;
   CORBA::ULong workers_ready_;
   CORBA::ULong number_of_workers_;
@@ -253,7 +253,7 @@ start_synchronization (test_ptr test,
     }
 
   {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                       mon,
                       synchronizers.worker_lock_,
                       -1);
@@ -297,7 +297,7 @@ int
 end_synchronization (Synchronizers &synchronizers)
 {
   {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                       mon,
                       synchronizers.worker_lock_,
                       -1);
@@ -497,7 +497,7 @@ Paced_Worker::deadline_for_current_call (CORBA::ULong i)
 void
 Paced_Worker::print_stats (ACE_hrtime_t test_end)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX,
+  ACE_GUARD (TAO_SYNCH_MUTEX,
              mon,
              this->synchronizers_.worker_lock_);
 
@@ -737,7 +737,7 @@ void
 Continuous_Worker::print_stats (ACE_Sample_History &history,
                                 ACE_hrtime_t test_end)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX,
+  ACE_GUARD (TAO_SYNCH_MUTEX,
              mon,
              this->synchronizers_.worker_lock_);
 
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index 1abeb5c48e1..217a6415ea0 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -68,7 +68,7 @@ Session::svc (void)
         }
 
       {
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
         this->active_thread_count_--;
         if (this->more_work ())
           {
@@ -119,7 +119,7 @@ Session::start (const Test::Session_List &other_sessions)
     throw Test::No_Peers ();
 
   {
-    ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
     if (this->running_)
       throw Test::Already_Running ();
 
@@ -183,7 +183,7 @@ Session::receive_payload (const Test::Payload &the_payload)
     }
 
   {
-    ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
     --this->expected_messages_;
 
 #if 0
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index d34af92249d..d7ead0a9a8c 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -57,7 +57,7 @@ private:
 
 private:
   /// Synchronize the internal state
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
 
   /// Keep a reference to the Session_Control, this is used to report
   /// when the test finishes.
diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp
index 9c298313d19..d0fab0de5fa 100644
--- a/TAO/tests/Big_Oneways/Session_Control.cpp
+++ b/TAO/tests/Big_Oneways/Session_Control.cpp
@@ -43,7 +43,7 @@ Session_Control::~Session_Control (void)
 void
 Session_Control::session_finished (CORBA::Boolean success)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   if (this->session_count_ == 0)
     {
       ACE_ERROR ((LM_ERROR,
diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h
index 2da60584c36..96a6d734e72 100644
--- a/TAO/tests/Big_Oneways/Session_Control.h
+++ b/TAO/tests/Big_Oneways/Session_Control.h
@@ -30,7 +30,7 @@ public:
 
 private:
   /// Synchronize the internal state
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
 
   /// The type of test
   CORBA::ULong session_count_;
diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp
index 9a176764603..9c90a5e0554 100644
--- a/TAO/tests/Big_Twoways/Session.cpp
+++ b/TAO/tests/Big_Twoways/Session.cpp
@@ -66,7 +66,7 @@ Session::svc (void)
         }
 
       {
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
         this->active_thread_count_--;
         if (this->more_work ())
           {
@@ -95,7 +95,7 @@ Session::start (const Test::Session_List &other_sessions)
     throw Test::No_Peers ();
 
   {
-    ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
     if (this->running_)
       throw Test::Already_Running ();
 
@@ -156,7 +156,7 @@ Session::echo_payload (const Test::Payload &the_payload)
   Test::Payload_var retval (new Test::Payload (the_payload));
 
   {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_,
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_,
                       retval._retn ());
     this->expected_messages_--;
 
diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h
index becf16912e8..5c0934db301 100644
--- a/TAO/tests/Big_Twoways/Session.h
+++ b/TAO/tests/Big_Twoways/Session.h
@@ -55,7 +55,7 @@ private:
 
 private:
   /// Synchronize the internal state
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
 
   /// Keep a reference to the Session_Control, this is used to report
   /// when the test finishes.
diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp
index 98d2eaaa728..bd51595b39d 100644
--- a/TAO/tests/Big_Twoways/Session_Control.cpp
+++ b/TAO/tests/Big_Twoways/Session_Control.cpp
@@ -43,7 +43,7 @@ Session_Control::~Session_Control (void)
 void
 Session_Control::session_finished (CORBA::Boolean success)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   if (this->session_count_ == 0)
     {
       ACE_ERROR ((LM_ERROR,
diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h
index 2da60584c36..96a6d734e72 100644
--- a/TAO/tests/Big_Twoways/Session_Control.h
+++ b/TAO/tests/Big_Twoways/Session_Control.h
@@ -30,7 +30,7 @@ public:
 
 private:
   /// Synchronize the internal state
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
 
   /// The type of test
   CORBA::ULong session_count_;
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
index 7a300a5db2e..05cf417b3a0 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
@@ -14,7 +14,7 @@ Echo::Echo(CORBA::ORB_ptr orb,
 void
 Echo::echo_payload (Test::Payload &)
 {
-  ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX,
+  ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
                      ace_mon,
                      this->mutex_));
 
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.h b/TAO/tests/Bug_1020_Basic_Regression/Echo.h
index 55aed2b36df..03676f8ef74 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo.h
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.h
@@ -25,7 +25,7 @@ private:
 
   int abort_counter_;
 
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
 };
 
 #endif /* BUG_1020_BASIC_REGRESSION_ECHO_H*/
diff --git a/TAO/tests/Bug_1361_Regression/Echo.h b/TAO/tests/Bug_1361_Regression/Echo.h
index 59e08d6b754..c989dd2ca78 100644
--- a/TAO/tests/Bug_1361_Regression/Echo.h
+++ b/TAO/tests/Bug_1361_Regression/Echo.h
@@ -28,7 +28,7 @@ public:
 private:
   CORBA::ORB_var orb_;
 
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> abort_counter_;
+  ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> abort_counter_;
 };
 
 #endif /* TAO_TESTS_BUG1270_ECHO_H*/
diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp
index 18fc6160d94..96cff6b785e 100644
--- a/TAO/tests/Bug_2805_Regression/client.cpp
+++ b/TAO/tests/Bug_2805_Regression/client.cpp
@@ -28,7 +28,7 @@ const char *ior = "file://test.ior";
 int nthreads = 5;
 int niterations = 5;
 int debug = 0;
-ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> number_of_replies = 0;
+ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> number_of_replies = 0;
 
 CORBA::Long in_number = 931232;
 const char * in_str = "Let's talk AMI.";
diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp
index cd51d4f79a0..942f7ab40e6 100644
--- a/TAO/tests/Bug_2909_Regression/client.cpp
+++ b/TAO/tests/Bug_2909_Regression/client.cpp
@@ -27,7 +27,7 @@ const char *ior = "file://test.ior";
 int nthreads = 1;
 int niterations = 2;
 int debug = 0;
-ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> number_of_replies = 0;
+ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> number_of_replies = 0;
 
 int invalid_exception = 0;
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
index f3bc9706e2c..50aa093f9a6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
@@ -24,7 +24,7 @@ class CSD_TP_Test_Export AppShutdown
 
   private:
 
-    typedef ACE_SYNCH_MUTEX LockType;
+    typedef TAO_SYNCH_MUTEX LockType;
     typedef ACE_Guard<LockType> GuardType;
 
     LockType lock_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h
index 272b1829c89..895aeaa52cb 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h
@@ -25,7 +25,7 @@ class ClientEngine;
 typedef TAO_Intrusive_Ref_Count_Handle<ClientEngine> ClientEngine_Handle;
 
 
-class CSD_TP_Test_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX>
+class CSD_TP_Test_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX>
 {
   public:
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h
index cc3de7ec8a2..006035f2347 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h
@@ -37,7 +37,7 @@ class CSD_TP_Test_Export ClientTask : public ACE_Task_Base
 
   private:
 
-     typedef ACE_SYNCH_MUTEX     LockType;
+     typedef TAO_SYNCH_MUTEX     LockType;
      typedef ACE_Guard<LockType> GuardType;
 
      typedef ACE_Vector<ClientEngine_Handle> EngineVector;
diff --git a/TAO/tests/MT_BiDir/Receiver_i.cpp b/TAO/tests/MT_BiDir/Receiver_i.cpp
index b8e19c0c9a0..cf6b1a2c027 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.cpp
+++ b/TAO/tests/MT_BiDir/Receiver_i.cpp
@@ -17,7 +17,7 @@ Receiver_i::Receiver_i (void)
 void
 Receiver_i::receive_payload (const Receiver::Payload &payload)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->message_count_++;
   this->byte_count_ += payload.length ();
 }
@@ -25,6 +25,6 @@ Receiver_i::receive_payload (const Receiver::Payload &payload)
 CORBA::Long
 Receiver_i::get_event_count (void)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->message_count_;
 }
diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp
index ba0c78d6c1a..2ebfaef6978 100644
--- a/TAO/tests/MT_BiDir/Sender_i.cpp
+++ b/TAO/tests/MT_BiDir/Sender_i.cpp
@@ -31,7 +31,7 @@ Sender_i::Sender_i (int no_clients,
 CORBA::Long
 Sender_i::receiver_object (Receiver_ptr recv)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
                     this->mutex_,-1);
 
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index 645166d9d5b..cceb353c6fc 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -115,7 +115,7 @@ private:
   int niterations_;
 
 
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
 };
 
 /***************************************************/
@@ -246,7 +246,7 @@ SelfClient::validate_connection (void)
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
   // run on minimum CORBA builds too!
-  ACE_GUARD (ACE_SYNCH_MUTEX, guard, mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, guard, mutex_);
 
   for (int j = 0; j != 100; ++j)
     {
diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp
index b746df4426e..1ad5ab31565 100644
--- a/TAO/tests/Muxing/Receiver.cpp
+++ b/TAO/tests/Muxing/Receiver.cpp
@@ -15,7 +15,7 @@ Receiver::Receiver (CORBA::ORB_ptr orb)
 void
 Receiver::dump_results ()
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   ACE_DEBUG ((LM_DEBUG,
               "Total messages = %d\n"
               "Total bytes = %d\n",
@@ -26,7 +26,7 @@ Receiver::dump_results ()
 void
 Receiver::receive_data (const Test::Payload &payload)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->message_count_++;
   this->byte_count_ += payload.length ();
 }
@@ -34,7 +34,7 @@ Receiver::receive_data (const Test::Payload &payload)
 CORBA::Long
 Receiver::get_event_count (void)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->message_count_;
 }
 
diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h
index 87abf4b5082..a69e6d9fc5d 100644
--- a/TAO/tests/Muxing/Receiver.h
+++ b/TAO/tests/Muxing/Receiver.h
@@ -34,7 +34,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
   CORBA::ULong message_count_;
   CORBA::ULong byte_count_;
   /// Use an ORB reference to shutdown
diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp
index f9e47df0972..e82205e3e05 100644
--- a/TAO/tests/Stack_Recursion/Sender.cpp
+++ b/TAO/tests/Stack_Recursion/Sender.cpp
@@ -18,7 +18,7 @@ Sender::Sender (CORBA::ORB_ptr orb)
 void
 Sender::dump_results (void)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   ACE_DEBUG ((LM_DEBUG,
               "Total messages = %d\n"
               "Total bytes = %d\n",
@@ -36,7 +36,7 @@ CORBA::Boolean
 Sender::get_data (CORBA::ULong size,
                   Test::Payload_out payload)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
                     this->mutex_,
                     0);
@@ -53,7 +53,7 @@ Sender::get_data (CORBA::ULong size,
 CORBA::Long
 Sender::get_event_count (void)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
                     this->mutex_,
                     0);
@@ -72,7 +72,7 @@ Sender::shutdown (void)
 {
   if (this->is_done_ == false)
     {
-      ACE_GUARD (ACE_SYNCH_MUTEX,
+      ACE_GUARD (TAO_SYNCH_MUTEX,
                  ace_mon,
                  this->mutex_);
 
diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h
index 8e66804cd41..5af96f9d9b5 100644
--- a/TAO/tests/Stack_Recursion/Sender.h
+++ b/TAO/tests/Stack_Recursion/Sender.h
@@ -36,7 +36,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
   CORBA::ULong message_count_;
   CORBA::ULong byte_count_;
   CORBA::ORB_var orb_;