ChangeLog Entry : Fri Jun 4 00:32:04 1999 Alexander Babu Arulanthu <alex@cs.wustl.edu>

12 files changed, 97 insertions, 97 deletions

diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp
index e61d462992e..cf3a34b4b83 100644
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ b/TAO/tao/Client_Strategy_Factory.cpp
@@ -18,8 +18,8 @@ TAO_Client_Strategy_Factory::create_iiop_profile_lock (void)
   return 0;
 }
 
-TAO_Request_Mux_Strategy *
-TAO_Client_Strategy_Factory::create_request_mux_strategy (void)
+TAO_Transport_Mux_Strategy *
+TAO_Client_Strategy_Factory::create_transport_mux_strategy (void)
 {
   return 0;
 }
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
index f58d2791521..745a605b861 100644
--- a/TAO/tao/Client_Strategy_Factory.h
+++ b/TAO/tao/Client_Strategy_Factory.h
@@ -22,7 +22,7 @@
 #include "tao/corbafwd.h"
 
 class ACE_Lock;
-class TAO_Request_Mux_Strategy;
+class TAO_Transport_Mux_Strategy;
 class TAO_Wait_Strategy;
 class TAO_Transport;
 
@@ -44,7 +44,7 @@ public:
   // the TAO_GIOP_Invocation::location_forward and the
   // TAO_GIOP_Invocation::start
 
-  virtual TAO_Request_Mux_Strategy *create_request_mux_strategy (void);
+  virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (void);
   // Create the correct client request muxing strategy.
 
   virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index d079dc20590..e10d41e2be4 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -7,7 +7,7 @@
 #include "tao/IIOP_Connect.h"
 #include "tao/Timeprobe.h"
 #include "tao/CDR.h"
-#include "tao/Request_Mux_Strategy.h"
+#include "tao/Transport_Mux_Strategy.h"
 #include "tao/Wait_Strategy.h"
 #include "tao/Reply_Dispatcher.h"
 #include "tao/ORB_Core.h"
@@ -167,7 +167,7 @@ TAO_IIOP_Client_Transport::handle_client_input (int block)
   //    removed.
   //    Do I make any sense?
 
-  TAO_InputCDR* cdr = this->rms_->get_cdr_stream ();
+  TAO_InputCDR* cdr = this->tms_->get_cdr_stream ();
   ACE_Message_Block* payload =
     ACE_const_cast(ACE_Message_Block*, cdr->start ());
 
@@ -212,7 +212,7 @@ TAO_IIOP_Client_Transport::handle_client_input (int block)
       return -1;
     }
 
-  if (this->rms_->dispatch_reply (request_id,
+  if (this->tms_->dispatch_reply (request_id,
                                   reply_status,
                                   header_copy.giop_version,
                                   reply_ctx,
@@ -228,7 +228,7 @@ TAO_IIOP_Client_Transport::handle_client_input (int block)
 
   // This is a NOOP for the Exclusive request case, but it actually
   // destroys the stream in the muxed case.
-  this->rms_->destroy_cdr_stream (cdr);
+  this->tms_->destroy_cdr_stream (cdr);
 
   // Return something to indicate the reply is received.
   return 1;
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index b1a0975c63c..dfbb352195f 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -35,7 +35,7 @@ PUB_HDRS = \
   Client_Strategy_Factory \
   ORB_Core \
   Wait_Strategy \
-  Request_Mux_Strategy \
+  Transport_Mux_Strategy \
   Reply_Dispatcher
 
 POA_FILES = \
@@ -126,7 +126,7 @@ ORB_CORE_FILES = \
   IOR_LookupTable \
   TAO \
   Wait_Strategy \
-  Request_Mux_Strategy \
+  Transport_Mux_Strategy \
   Reply_Dispatcher
 
 DYNAMIC_ANY_FILES =
@@ -2115,7 +2115,7 @@ realclean:
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/Request_Mux_Strategy.h \
+ $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h
 .obj/Connector_Registry.o .obj/Connector_Registry.so .shobj/Connector_Registry.o .shobj/Connector_Registry.so: Connector_Registry.cpp \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -3287,7 +3287,7 @@ realclean:
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Request_Mux_Strategy.h \
+ $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -4747,7 +4747,7 @@ realclean:
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Request_Mux_Strategy.h \
+ $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -5734,7 +5734,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/Request_Mux_Strategy.h
+ $(TAO_ROOT)/tao/Transport_Mux_Strategy.h
 .obj/default_server.o .obj/default_server.so .shobj/default_server.o .shobj/default_server.so: default_server.cpp \
  $(TAO_ROOT)/tao/default_server.h \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
@@ -12969,8 +12969,8 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/debug.h
-.obj/Request_Mux_Strategy.o .obj/Request_Mux_Strategy.so .shobj/Request_Mux_Strategy.o .shobj/Request_Mux_Strategy.so: Request_Mux_Strategy.cpp \
- $(TAO_ROOT)/tao/Request_Mux_Strategy.h \
+.obj/Transport_Mux_Strategy.o .obj/Transport_Mux_Strategy.so .shobj/Transport_Mux_Strategy.o .shobj/Transport_Mux_Strategy.so: Transport_Mux_Strategy.cpp \
+ $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
index 536adfdbc0a..70464cde846 100644
--- a/TAO/tao/Pluggable.cpp
+++ b/TAO/tao/Pluggable.cpp
@@ -9,7 +9,7 @@
 #include "tao/Object_KeyC.h"
 #include "tao/Client_Strategy_Factory.h"
 #include "tao/Wait_Strategy.h"
-#include "tao/Request_Mux_Strategy.h"
+#include "tao/Transport_Mux_Strategy.h"
 #include "tao/Reply_Dispatcher.h"
 #include "tao/debug.h"
 
@@ -204,22 +204,22 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
                               TAO_ORB_Core *orb_core)
   : tag_ (tag),
     orb_core_ (orb_core),
-    rms_ (0),
+    tms_ (0),
     ws_ (0)
 {
   // Create WS now.
   this->ws_ = orb_core->client_factory ()->create_wait_strategy (this);
 
-  // Create RMS now.
-  this->rms_ = orb_core->client_factory ()->create_request_mux_strategy ();
+  // Create TMS now.
+  this->tms_ = orb_core->client_factory ()->create_transport_mux_strategy ();
 }
 
 TAO_Transport::~TAO_Transport (void)
 {
   delete this->ws_;
   this->ws_ = 0;
-  delete this->rms_;
-  this->rms_ =0;
+  delete this->tms_;
+  this->tms_ =0;
 }
 
 CORBA::ULong
@@ -228,29 +228,29 @@ TAO_Transport::tag (void) const
   return this->tag_;
 }
 
-// @@ Alex: this stream stuff belongs to the RMS, right?
+// @@ Alex: this stream stuff belongs to the TMS, right?
 //    Maybe the right interface is:
 //    TAO_Transport::bind_reply_dispatcher (request_id,
 //                                          reply_dispatcher,
 //                                          input_cdr);
 
 // @@ Do you need an accessor? Or is the CDR stream simply passed by
-//    the RMS to the right target.  We should go to the RMS and obtain
+//    the TMS to the right target.  We should go to the TMS and obtain
 //    the CDR stream from it, that way we can implement an optimized
-//    version of the RMS that uses a single CDR stream allocated from
+//    version of the TMS that uses a single CDR stream allocated from
 //    the stack.
 
 // Get the CDR stream for reading the input message.
 TAO_InputCDR *
 TAO_Transport::input_cdr_stream (void) const
 {
-  return this->rms_->get_cdr_stream ();
+  return this->tms_->get_cdr_stream ();
 }
 
 void
 TAO_Transport::destroy_cdr_stream (TAO_InputCDR *cdr) const
 {
-  this->rms_->destroy_cdr_stream (cdr);
+  this->tms_->destroy_cdr_stream (cdr);
 }
 
 // Get it.
@@ -260,10 +260,10 @@ TAO_Transport::orb_core (void) const
   return this->orb_core_;
 }
 
-TAO_Request_Mux_Strategy *
-TAO_Transport::rms (void) const
+TAO_Transport_Mux_Strategy *
+TAO_Transport::tms (void) const
 {
-  return rms_;
+  return tms_;
 }
 
 // Return the Wait strategy used by the Transport.
@@ -273,19 +273,19 @@ TAO_Transport::wait_strategy (void) const
   return this->ws_;
 }
 
-// Get request id for the current invocation from the RMS object.
+// Get request id for the current invocation from the TMS object.
 CORBA::ULong
 TAO_Transport::request_id (void)
 {
-  return this->rms ()->request_id ();
+  return this->tms ()->request_id ();
 }
 
-// Bind the reply dispatcher with the RMS object.
+// Bind the reply dispatcher with the TMS object.
 int
 TAO_Transport::bind_reply_dispatcher (CORBA::ULong request_id,
                                       TAO_Reply_Dispatcher *rd)
 {
-  return this->rms_->bind_dispatcher (request_id,
+  return this->tms_->bind_dispatcher (request_id,
                                       rd);
 }
 
diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h
index 04980dc3dbd..9a0e0bdb159 100644
--- a/TAO/tao/Pluggable.h
+++ b/TAO/tao/Pluggable.h
@@ -36,7 +36,7 @@ class TAO_MProfile;
 class TAO_Resource_Factory;
 
 class TAO_Reply_Dispatcher;
-class TAO_Request_Mux_Strategy;
+class TAO_Transport_Mux_Strategy;
 class TAO_Wait_Strategy;
 
 class TAO_Export TAO_Transport
@@ -139,10 +139,10 @@ public:
 
   // = Get and set methods for thr RMS object.
 
-  // void rms (TAO_Request_Mux_Strategy *rms);
+  // void rms (TAO_Transport_Mux_Strategy *rms);
   // Set the RMS object.
 
-  TAO_Request_Mux_Strategy * rms (void) const;
+  TAO_Transport_Mux_Strategy * rms (void) const;
   // Get the RMS used by this Transport object.
 
   TAO_Wait_Strategy *wait_strategy (void) const;
@@ -178,7 +178,7 @@ protected:
   TAO_ORB_Core *orb_core_;
   // Global orbcore resource.
 
-  TAO_Request_Mux_Strategy *rms_;
+  TAO_Transport_Mux_Strategy *tms_;
   // Strategy to decide whether multiple requests can be sent over the
   // same connection or the connection is exclusive for a request.
 
diff --git a/TAO/tao/Request_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp
index b0e7dd99489..63d82156e18 100644
--- a/TAO/tao/Request_Mux_Strategy.cpp
+++ b/TAO/tao/Transport_Mux_Strategy.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Request_Mux_Strategy.h"
+#include "tao/Transport_Mux_Strategy.h"
 #include "tao/Reply_Dispatcher.h"
 #include "tao/debug.h"
 
@@ -12,21 +12,21 @@
 //    to guarantee that nobody else is using it.
 //    We may need to add a couple of methods to implement that.
 
-TAO_Request_Mux_Strategy::TAO_Request_Mux_Strategy (void)
+TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy (void)
 {
 }
 
-TAO_Request_Mux_Strategy::~TAO_Request_Mux_Strategy (void)
+TAO_Transport_Mux_Strategy::~TAO_Transport_Mux_Strategy (void)
 {
 }
 
 // *********************************************************************
 
-TAO_Muxed_RMS::TAO_Muxed_RMS (void)
+TAO_Muxed_TMS::TAO_Muxed_TMS (void)
 {
 }
 
-TAO_Muxed_RMS::~TAO_Muxed_RMS (void)
+TAO_Muxed_TMS::~TAO_Muxed_TMS (void)
 {
   // @@ delete ???
 }
@@ -34,7 +34,7 @@ TAO_Muxed_RMS::~TAO_Muxed_RMS (void)
 // Generate and return an unique request id for the current
 // invocation.
 CORBA::ULong
-TAO_Muxed_RMS::request_id (void)
+TAO_Muxed_TMS::request_id (void)
 {
   // @@
   return 0;
@@ -42,7 +42,7 @@ TAO_Muxed_RMS::request_id (void)
 
 // Bind the dispatcher with the request id.
 int
-TAO_Muxed_RMS::bind_dispatcher (CORBA::ULong request_id,
+TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id,
                                 TAO_Reply_Dispatcher *rh)
 {
   // @@
@@ -50,7 +50,7 @@ TAO_Muxed_RMS::bind_dispatcher (CORBA::ULong request_id,
 }
 
 int
-TAO_Muxed_RMS::dispatch_reply (CORBA::ULong request_id,
+TAO_Muxed_TMS::dispatch_reply (CORBA::ULong request_id,
                                CORBA::ULong reply_status,
                                const TAO_GIOP_Version& version,
                                TAO_GIOP_ServiceContextList& reply_ctx,
@@ -61,13 +61,13 @@ TAO_Muxed_RMS::dispatch_reply (CORBA::ULong request_id,
 }
 
 TAO_InputCDR *
-TAO_Muxed_RMS::get_cdr_stream (void)
+TAO_Muxed_TMS::get_cdr_stream (void)
 {
   return 0;
 }
 
 void
-TAO_Muxed_RMS::destroy_cdr_stream (TAO_InputCDR *)
+TAO_Muxed_TMS::destroy_cdr_stream (TAO_InputCDR *)
 {
   // @@ Implement.
   // delete cdr;
@@ -76,14 +76,14 @@ TAO_Muxed_RMS::destroy_cdr_stream (TAO_InputCDR *)
 
 // *********************************************************************
 
-TAO_Exclusive_RMS::TAO_Exclusive_RMS (void)
+TAO_Exclusive_TMS::TAO_Exclusive_TMS (void)
   : request_id_generator_ (0),
     request_id_ (0),
     rd_ (0)
 {
 }
 
-TAO_Exclusive_RMS::~TAO_Exclusive_RMS (void)
+TAO_Exclusive_TMS::~TAO_Exclusive_TMS (void)
 {
 }
 
@@ -91,7 +91,7 @@ TAO_Exclusive_RMS::~TAO_Exclusive_RMS (void)
 // invocation. We can actually return a predecided ULong, since we
 // allow only one invocation over this connection at a time.
 CORBA::ULong
-TAO_Exclusive_RMS::request_id (void)
+TAO_Exclusive_TMS::request_id (void)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
   return this->request_id_generator_++;
@@ -99,7 +99,7 @@ TAO_Exclusive_RMS::request_id (void)
 
 // Bind the handler with the request id.
 int
-TAO_Exclusive_RMS::bind_dispatcher (CORBA::ULong request_id,
+TAO_Exclusive_TMS::bind_dispatcher (CORBA::ULong request_id,
                                     TAO_Reply_Dispatcher *rd)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
@@ -109,7 +109,7 @@ TAO_Exclusive_RMS::bind_dispatcher (CORBA::ULong request_id,
 }
 
 int
-TAO_Exclusive_RMS::dispatch_reply (CORBA::ULong request_id,
+TAO_Exclusive_TMS::dispatch_reply (CORBA::ULong request_id,
                                    CORBA::ULong reply_status,
                                    const TAO_GIOP_Version& version,
                                    TAO_GIOP_ServiceContextList& reply_ctx,
@@ -120,7 +120,7 @@ TAO_Exclusive_RMS::dispatch_reply (CORBA::ULong request_id,
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Exclusive_RMS::dispatch_reply - <%d != %d>\n",
+                    "TAO_Exclusive_TMS::dispatch_reply - <%d != %d>\n",
                     this->request_id_, request_id));
       return -1;
     }
@@ -136,7 +136,7 @@ TAO_Exclusive_RMS::dispatch_reply (CORBA::ULong request_id,
 }
 
 TAO_InputCDR *
-TAO_Exclusive_RMS::get_cdr_stream (void)
+TAO_Exclusive_TMS::get_cdr_stream (void)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
   if (this->rd_ == 0)
@@ -147,6 +147,6 @@ TAO_Exclusive_RMS::get_cdr_stream (void)
 
 // NOOP function.
 void
-TAO_Exclusive_RMS::destroy_cdr_stream (TAO_InputCDR *)
+TAO_Exclusive_TMS::destroy_cdr_stream (TAO_InputCDR *)
 {
 }
diff --git a/TAO/tao/Request_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h
index 6c35c496235..7bbe6a181da 100644
--- a/TAO/tao/Request_Mux_Strategy.h
+++ b/TAO/tao/Transport_Mux_Strategy.h
@@ -6,18 +6,18 @@
 //     TAO
 //
 // = FILENAME
-//     Request_Mux_Strategy.h
+//     Transport_Mux_Strategy.h
 //
 // = DESCRIPTION
-//     IIOP Request Mux Strategies.
+//     IIOP Transport Mux Strategies.
 //
 // = AUTHOR
 //     Alexander Babu Arulanthu <alex@cs.wustl.edu>
 //
 // ============================================================================
 
-#ifndef TAO_REQUEST_MUX_STRATEGY_H
-#define TAO_REQUEST_MUX_STRATEGY_H
+#ifndef TAO_TRANSPORT_MUX_STRATEGY_H
+#define TAO_TRANSPORT_MUX_STRATEGY_H
 
 #include "tao/GIOP.h"
 
@@ -29,7 +29,7 @@ class TAO_Reply_Dispatcher;
 struct TAO_GIOP_Version;
 class TAO_InputCDR;
 
-class TAO_Export TAO_Request_Mux_Strategy
+class TAO_Export TAO_Transport_Mux_Strategy
 {
   // = TITLE
   //
@@ -41,10 +41,10 @@ class TAO_Export TAO_Request_Mux_Strategy
   //
 
 public:
-  TAO_Request_Mux_Strategy (void);
+  TAO_Transport_Mux_Strategy (void);
   // Base class constructor.
 
-  virtual ~TAO_Request_Mux_Strategy (void);
+  virtual ~TAO_Transport_Mux_Strategy (void);
   // Base class destructor.
 
   virtual CORBA::ULong request_id (void)  = 0;
@@ -78,7 +78,7 @@ public:
   // Destroy a CDR stream.
 };
 
-class TAO_Export TAO_Muxed_RMS : public  TAO_Request_Mux_Strategy
+class TAO_Export TAO_Muxed_TMS : public  TAO_Transport_Mux_Strategy
 {
   // = TITLE
   //
@@ -88,10 +88,10 @@ class TAO_Export TAO_Muxed_RMS : public  TAO_Request_Mux_Strategy
   //
 
 public:
-  TAO_Muxed_RMS (void);
+  TAO_Muxed_TMS (void);
   // Constructor.
 
-  virtual ~TAO_Muxed_RMS (void);
+  virtual ~TAO_Muxed_TMS (void);
   // Destructor.
 
   // = The TAO Request Strategy methods...
@@ -110,7 +110,7 @@ protected:
   // @@ HASH TABLE???
 };
 
-class TAO_Export TAO_Exclusive_RMS : public TAO_Request_Mux_Strategy
+class TAO_Export TAO_Exclusive_TMS : public TAO_Transport_Mux_Strategy
 {
   // = TITLE
   //
@@ -120,10 +120,10 @@ class TAO_Export TAO_Exclusive_RMS : public TAO_Request_Mux_Strategy
   //
 
 public:
-  TAO_Exclusive_RMS (void);
+  TAO_Exclusive_TMS (void);
   // Constructor.
 
-  virtual ~TAO_Exclusive_RMS (void);
+  virtual ~TAO_Exclusive_TMS (void);
   // Destructor.
 
   // = The TAO Request Strategy methods...
@@ -153,4 +153,4 @@ protected:
   // Reply Dispatcher corresponding to the request.
 };
 
-#endif /* REQUEST_MUX_STRATEGY_H */
+#endif /* TRANSPORT_MUX_STRATEGY_H */
diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp
index c0827bc9940..d1a0682b9db 100644
--- a/TAO/tao/UIOP_Transport.cpp
+++ b/TAO/tao/UIOP_Transport.cpp
@@ -7,7 +7,7 @@
 #include "tao/UIOP_Connect.h"
 #include "tao/Timeprobe.h"
 #include "tao/CDR.h"
-#include "tao/Request_Mux_Strategy.h"
+#include "tao/Transport_Mux_Strategy.h"
 #include "tao/Wait_Strategy.h"
 #include "tao/Reply_Dispatcher.h"
 #include "tao/ORB_Core.h"
@@ -167,7 +167,7 @@ TAO_UIOP_Client_Transport::handle_client_input (int block)
   //    removed.
   //    Do I make any sense?
 
-  TAO_InputCDR* cdr = this->rms_->get_cdr_stream ();
+  TAO_InputCDR* cdr = this->tms_->get_cdr_stream ();
   ACE_Message_Block* payload =
     ACE_const_cast(ACE_Message_Block*, cdr->start ());
 
@@ -212,7 +212,7 @@ TAO_UIOP_Client_Transport::handle_client_input (int block)
       return -1;
     }
 
-  if (this->rms_->dispatch_reply (request_id,
+  if (this->tms_->dispatch_reply (request_id,
                                   reply_status,
                                   header_copy.giop_version,
                                   reply_ctx,
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index ad5d1b93cc7..ecf866d68f1 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -21,7 +21,7 @@
 
 #include "tao/CDR.h"
 
-class TAO_Request_Mux_Strategy;
+class TAO_Transport_Mux_Strategy;
 class TAO_Transport;
 
 class TAO_Export TAO_Wait_Strategy
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index d4851ebde16..f45d053efb4 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -3,7 +3,7 @@
 #include "tao/default_client.h"
 #include "tao/ORB_Core.h"
 #include "tao/Wait_Strategy.h"
-#include "tao/Request_Mux_Strategy.h"
+#include "tao/Transport_Mux_Strategy.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/default_client.i"
@@ -21,11 +21,11 @@ TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
   this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER;
 #endif /* TAO_USE_ST_CLIENT_CONNECTION_HANDLER */
 
-#if defined (TAO_USE_MUXED_REQUEST_MUX_STRATEGY)
-  this->request_mux_strategy_ = TAO_MUXED_RMS;
+#if defined (TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY)
+  this->transport_mux_strategy_ = TAO_MUXED_TMS;
 #else
-  this->request_mux_strategy_ = TAO_EXCLUSIVE_RMS;
-#endif /* TAO_USE_MUXED_REQUEST_MUX_STRATEGY */
+  this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS;
+#endif /* TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY */
 
 // #if defined (TAO_USE_WAIT_ON_READ)
 //   this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER;
@@ -98,9 +98,9 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv)
               char *name = argv[curarg];
 
               if (ACE_OS::strcasecmp (name, "MUXED") == 0)
-                this->request_mux_strategy_ = TAO_MUXED_RMS;
+                this->transport_mux_strategy_ = TAO_MUXED_TMS;
               else if (ACE_OS::strcasecmp (name, "EXCLUSIVE") == 0)
-                this->request_mux_strategy_ = TAO_EXCLUSIVE_RMS;
+                this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS;
             }
         }
     }
@@ -124,32 +124,32 @@ TAO_Default_Client_Strategy_Factory::create_iiop_profile_lock (void)
   return the_lock;
 }
 
-// @@ Alex: implement the WS and RMS methods here, similar to the
+// @@ Alex: implement the WS and TMS methods here, similar to the
 //    create_iiop_profile_lock above...
 // @@ Alex: remember your idea of using the
 //    -ORBclientconnectionhandler option to implement the WS factory,
-//    but you need new options for the RMS...
+//    but you need new options for the TMS...
 
 // Create the correct client request muxing strategy.
-TAO_Request_Mux_Strategy *
-TAO_Default_Client_Strategy_Factory::create_request_mux_strategy (void)
+TAO_Transport_Mux_Strategy *
+TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (void)
 {
-  TAO_Request_Mux_Strategy *rms = 0;
+  TAO_Transport_Mux_Strategy *tms = 0;
 
-  if (this->request_mux_strategy_ == TAO_MUXED_RMS)
+  if (this->transport_mux_strategy_ == TAO_MUXED_TMS)
     {
-      ACE_NEW_RETURN (rms,
-                      TAO_Muxed_RMS,
+      ACE_NEW_RETURN (tms,
+                      TAO_Muxed_TMS,
                       0);
     }
   else
     {
-      ACE_NEW_RETURN (rms,
-                      TAO_Exclusive_RMS,
+      ACE_NEW_RETURN (tms,
+                      TAO_Exclusive_TMS,
                       0);
     }
 
-  return rms;
+  return tms;
 }
 
 TAO_Wait_Strategy *
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 9314eb30b06..81f0a3c44e0 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -47,7 +47,7 @@ public:
   // the TAO_GIOP_Invocation::location_forward and the
   // TAO_GIOP_Invocation::start
 
-  TAO_Request_Mux_Strategy *create_request_mux_strategy (void);
+  TAO_Transport_Mux_Strategy *create_Transport_Mux_strategy (void);
   // Create the correct client request muxing strategy.
 
   TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
@@ -63,13 +63,13 @@ private:
   Lock_Type iiop_profile_lock_type_;
   // the lock type for forwarding IIOP Profile
 
-  enum Request_Mux_Strategy
+  enum Transport_Mux_Strategy
   {
-    TAO_MUXED_RMS,
-    TAO_EXCLUSIVE_RMS
+    TAO_MUXED_TMS,
+    TAO_EXCLUSIVE_TMS
   };
 
-  Request_Mux_Strategy request_mux_strategy_;
+  Transport_Mux_Strategy transport_mux_strategy_;
   // The client Request Mux Strategy.
 
   enum Wait_Strategy