Merged PortableGroup updates into the LB.ng_lb_iter01

65 files changed, 1410 insertions, 1224 deletions

diff --git a/TAO/orbsvcs/orbsvcs/LB_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/LB_GenericFactory.cpp
index 87c93109a22..6f7532ac4e5 100644
--- a/TAO/orbsvcs/orbsvcs/LB_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_GenericFactory.cpp
@@ -28,18 +28,18 @@ TAO_LB_GenericFactory::TAO_LB_GenericFactory (
 CORBA::Object_ptr
 TAO_LB_GenericFactory::create_object (
     const char * type_id,
-    const LoadBalancing::Criteria &the_criteria,
-    LoadBalancing::GenericFactory::FactoryCreationId_out
+    const PortableGroup::Criteria &the_criteria,
+    PortableGroup::GenericFactory::FactoryCreationId_out
       factory_creation_id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::NoFactory,
-                   LoadBalancing::ObjectNotCreated,
-                   LoadBalancing::InvalidCriteria,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::CannotMeetCriteria))
+                   PortableGroup::NoFactory,
+                   PortableGroup::ObjectNotCreated,
+                   PortableGroup::InvalidCriteria,
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::CannotMeetCriteria))
 {
-//   LoadBalancing::Properties_var properties =
+//   PortableGroup::Properties_var properties =
 //     this->property_manager_.get_type_properties (type_id,
 //                                                  ACE_TRY_ENV);
 //   ACE_CHECK_RETURN (CORBA::Object::_nil ());
@@ -50,14 +50,14 @@ TAO_LB_GenericFactory::create_object (
 //   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Extract the initial number of replicas to create.
-  LoadBalancing::InitialNumberReplicas initial_number_replicas =
-    this->property_manager_.initial_number_replicas (type_id,
+  PortableGroup::InitialNumberMembersValue initial_number_members =
+    this->property_manager_.initial_number_members (type_id,
                                                      the_criteria,
                                                      ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Extract the factory information for each of the replicas.
-  LoadBalancing::FactoryInfos_var factory_infos =
+  PortableGroup::FactoryInfos_var factory_infos =
     this->property_manager_.factory_infos (type_id,
                                            the_criteria,
                                            ACE_TRY_ENV);
@@ -68,8 +68,8 @@ TAO_LB_GenericFactory::create_object (
   // If the number of factories is less than the initial number of
   // replicas, then the desired number of replicas cannot possibly be
   // created.
-  if (factory_infos_count < initial_number_replicas)
-    ACE_THROW_RETURN (LoadBalancing::CannotMeetCriteria (),
+  if (factory_infos_count < initial_number_members)
+    ACE_THROW_RETURN (PortableGroup::CannotMeetCriteria (),
                       CORBA::Object::_nil ());
 
   TAO_LB_ObjectGroup_Map_Entry *object_group_entry = 0;
@@ -125,9 +125,9 @@ TAO_LB_GenericFactory::create_object (
 //     }
 
   // Allocate a new FactoryCreationId for use as an "out" parameter.
-  LoadBalancing::GenericFactory::FactoryCreationId *tmp = 0;
+  PortableGroup::GenericFactory::FactoryCreationId *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
-                    LoadBalancing::GenericFactory::FactoryCreationId,
+                    PortableGroup::GenericFactory::FactoryCreationId,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
                         TAO_DEFAULT_MINOR_CODE,
@@ -148,7 +148,7 @@ TAO_LB_GenericFactory::create_object (
   // Otherwise, an invalid object group entry would remain inside the
   // map.
   if (this->object_group_map_.bind (oid.in (), object_group_entry) != 0)
-    ACE_THROW_RETURN (LoadBalancing::ObjectNotCreated (),
+    ACE_THROW_RETURN (PortableGroup::ObjectNotCreated (),
                       CORBA::Object::_nil ());
 
   // No longer need to protect the allocated ObjectGroup_Map entry.
@@ -170,11 +170,11 @@ TAO_LB_GenericFactory::create_object (
 
 void
 TAO_LB_GenericFactory::delete_object (
-    const LoadBalancing::GenericFactory::FactoryCreationId &
+    const PortableGroup::GenericFactory::FactoryCreationId &
       factory_creation_id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectNotFound))
+                   PortableGroup::ObjectNotFound))
 {
   CORBA::ULong fcid = 0;
 
@@ -191,7 +191,7 @@ TAO_LB_GenericFactory::delete_object (
       TAO_LB_ObjectGroup_Map_Entry *object_group = 0;
 
       if (this->object_group_map_.find (oid.in (), object_group) == -1)
-        ACE_THROW (LoadBalancing::ObjectNotFound ());
+        ACE_THROW (PortableGroup::ObjectNotFound ());
 
       TAO_LB_ReplicaInfo_Set &replica_infos = object_group->replica_infos;
 
@@ -203,7 +203,7 @@ TAO_LB_GenericFactory::delete_object (
           {
             TAO_LB_ReplicaInfo *replica_info = (*i);
 
-            LoadBalancing::GenericFactory_ptr factory =
+            PortableGroup::GenericFactory_ptr factory =
               replica_info->factory_info.the_factory.in ();
 
             // If the factory reference is not nil, then the replica
@@ -211,7 +211,7 @@ TAO_LB_GenericFactory::delete_object (
             // factory deletes it.
             if (!CORBA::is_nil (factory))
               {
-                const LoadBalancing::GenericFactory::FactoryCreationId
+                const PortableGroup::GenericFactory::FactoryCreationId
                   &replica_fcid = replica_info->factory_creation_id.in ();
 
                 factory->delete_object (replica_fcid, ACE_TRY_ENV);
@@ -232,7 +232,7 @@ TAO_LB_GenericFactory::delete_object (
       delete object_group;
     }
   else
-    ACE_THROW (LoadBalancing::ObjectNotFound ());
+    ACE_THROW (PortableGroup::ObjectNotFound ());
 }
 
 void
@@ -244,7 +244,7 @@ TAO_LB_GenericFactory::poa (PortableServer::POA_ptr p)
 void
 TAO_LB_GenericFactory::populate_object_group (
   TAO_LB_ObjectGroup_Map_Entry *object_group_entry,
-  const LoadBalancing::FactoryInfos &factory_infos,
+  const PortableGroup::FactoryInfos &factory_infos,
   CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::ULong factory_infos_count = factory_infos.length ();
@@ -253,13 +253,13 @@ TAO_LB_GenericFactory::populate_object_group (
       TAO_LB_Location_Map_Entry *location_entry = 0;
       auto_ptr<TAO_LB_Location_Map_Entry> safe_location_entry;
 
-      const LoadBalancing::FactoryInfo &factory_info =
+      const PortableGroup::FactoryInfo &factory_info =
         factory_infos[j];
 
-      LoadBalancing::GenericFactory_ptr factory =
+      PortableGroup::GenericFactory_ptr factory =
         factory_info.the_factory.in ();
 
-      LoadBalancing::GenericFactory::FactoryCreationId_var
+      PortableGroup::GenericFactory::FactoryCreationId_var
         replica_fcid;
 
       CORBA::Object_var replica =
@@ -289,7 +289,7 @@ TAO_LB_GenericFactory::populate_object_group (
 
           if (this->location_map_.bind (factory_info.the_location,
                                         location_entry) != 0)
-            ACE_THROW (LoadBalancing::ObjectNotCreated ());
+            ACE_THROW (PortableGroup::ObjectNotCreated ());
         }
 
 #if 0
@@ -312,7 +312,7 @@ TAO_LB_GenericFactory::populate_object_group (
                                   ACE_TRY_ENV);
           ACE_CHECK;
 
-          ACE_THROW (LoadBalancing::NoFactory ());
+          ACE_THROW (PortableGroup::NoFactory ());
         }
 #endif  /* 0 */
 
@@ -337,7 +337,7 @@ TAO_LB_GenericFactory::populate_object_group (
           factory->delete_object (replica_fcid.in (), ACE_TRY_ENV);
           ACE_CHECK;
 
-          ACE_THROW (LoadBalancing::ObjectNotCreated ());
+          ACE_THROW (PortableGroup::ObjectNotCreated ());
         }
 
       replica_info->replica = replica;
diff --git a/TAO/orbsvcs/orbsvcs/LB_GenericFactory.h b/TAO/orbsvcs/orbsvcs/LB_GenericFactory.h
index bc077397c10..0d950dd28a5 100644
--- a/TAO/orbsvcs/orbsvcs/LB_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LB_GenericFactory.h
@@ -23,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/PortableServerC.h"
-#include "orbsvcs/LoadBalancingC.h"
+#include "orbsvcs/PortableGroupC.h"
 
 #include "LB_Location_Map.h"
 
@@ -37,7 +37,7 @@ struct TAO_LB_ObjectGroup_Map_Entry;
 /**
  * @class TAO_LB_GenericFactory
  *
- * @brief LoadBalancing::GenericFactory implementation used by the
+ * @brief PortableGroup::GenericFactory implementation used by the
  *        load balancer when creating object groups.
  *
  * This GenericFactory creates an object group reference for given set
@@ -45,7 +45,7 @@ struct TAO_LB_ObjectGroup_Map_Entry;
  * if the "infrastructure-controlled" membership style is configured.
  */
 class TAO_LB_GenericFactory
-  : public virtual LoadBalancing::GenericFactory
+  : public virtual PortableGroup::GenericFactory
 {
 public:
 
@@ -67,16 +67,16 @@ public:
    */
   virtual CORBA::Object_ptr create_object (
       const char * type_id,
-      const LoadBalancing::Criteria & the_criteria,
-      LoadBalancing::GenericFactory::FactoryCreationId_out
+      const PortableGroup::Criteria & the_criteria,
+      PortableGroup::GenericFactory::FactoryCreationId_out
         factory_creation_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::NoFactory,
-                     LoadBalancing::ObjectNotCreated,
-                     LoadBalancing::InvalidCriteria,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::CannotMeetCriteria));
+                     PortableGroup::NoFactory,
+                     PortableGroup::ObjectNotCreated,
+                     PortableGroup::InvalidCriteria,
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::CannotMeetCriteria));
 
   /**
    * Delete the object corresponding to the provided
@@ -85,11 +85,11 @@ public:
    * Afterward, the ObjectGroup itself will be deleted.
    */
   virtual void delete_object (
-      const LoadBalancing::GenericFactory::FactoryCreationId &
+      const PortableGroup::GenericFactory::FactoryCreationId &
         factory_creation_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectNotFound));
+                     PortableGroup::ObjectNotFound));
 
   //@}
 
@@ -103,7 +103,7 @@ private:
   /// object group being created.
   void populate_object_group (
          TAO_LB_ObjectGroup_Map_Entry *entry,
-         const LoadBalancing::FactoryInfos &factory_infos,
+         const PortableGroup::FactoryInfos &factory_infos,
          CORBA::Environment &ACE_TRY_ENV);
 
   /// Get a new ObjectId to be used when creating a new ObjectGroup.
diff --git a/TAO/orbsvcs/orbsvcs/LB_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/LB_Location_Equal_To.h
index ce73458b3cd..f7fa74dbdd9 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Location_Equal_To.h
+++ b/TAO/orbsvcs/orbsvcs/LB_Location_Equal_To.h
@@ -31,7 +31,7 @@
  *        names are the same.
  *
  * This functor simply does a string comparison of each of the
- * elements in the given TAO_LoadBalancing::Location name sequences.
+ * elements in the given TAO_PortableGroup::Location name sequences.
  */
 class TAO_LB_Location_Equal_To
 {
@@ -39,8 +39,8 @@ public:
 
   /// Perform a string comparison on each of the sequence elements in
   /// the given locations.
-  int operator() (const LoadBalancing::Location &lhs,
-                  const LoadBalancing::Location &rhs) const;
+  int operator() (const PortableGroup::Location &lhs,
+                  const PortableGroup::Location &rhs) const;
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_Location_Equal_To.inl b/TAO/orbsvcs/orbsvcs/LB_Location_Equal_To.inl
index c73be7e8ad5..9b3d2c794d5 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Location_Equal_To.inl
+++ b/TAO/orbsvcs/orbsvcs/LB_Location_Equal_To.inl
@@ -2,8 +2,8 @@
 
 ACE_INLINE int
 TAO_LB_Location_Equal_To::operator () (
-  const LoadBalancing::Location &lhs,
-  const LoadBalancing::Location &rhs) const
+  const PortableGroup::Location &lhs,
+  const PortableGroup::Location &rhs) const
 {
   // @todo Interim implementation until we figure out what to do when a
   //       location has multiple components.
diff --git a/TAO/orbsvcs/orbsvcs/LB_Location_Hash.h b/TAO/orbsvcs/orbsvcs/LB_Location_Hash.h
index 47a21aec618..04be62fb559 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Location_Hash.h
+++ b/TAO/orbsvcs/orbsvcs/LB_Location_Hash.h
@@ -35,7 +35,7 @@ class TAO_LB_Location_Hash
 public:
 
   /// Creates a hash based on all of elements of the given Location
-  CORBA::ULong operator() (const LoadBalancing::Location &) const;
+  CORBA::ULong operator() (const PortableGroup::Location &) const;
 };
 
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_Location_Hash.inl b/TAO/orbsvcs/orbsvcs/LB_Location_Hash.inl
index 1174194abae..1a8f81379f7 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Location_Hash.inl
+++ b/TAO/orbsvcs/orbsvcs/LB_Location_Hash.inl
@@ -4,7 +4,7 @@
 
 ACE_INLINE CORBA::ULong
 TAO_LB_Location_Hash::operator() (
-  const LoadBalancing::Location &location) const
+  const PortableGroup::Location &location) const
 {
   // @todo Interim implementation until we figure out what to do when a
   //       location has multiple components.
diff --git a/TAO/orbsvcs/orbsvcs/LB_Location_Map.cpp b/TAO/orbsvcs/orbsvcs/LB_Location_Map.cpp
index 8787bc9a0ff..ace3c27ccf5 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Location_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_Location_Map.cpp
@@ -9,18 +9,18 @@ ACE_RCSID (LoadBalancing,
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Hash_Map_Entry<LoadBalancing::Location, TAO_LB_Location_Map_Entry *>;
-template class ACE_Hash_Map_Manager_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Entry<PortableGroup::Location, TAO_LB_Location_Map_Entry *>;
+template class ACE_Hash_Map_Manager_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Hash_Map_Entry<LoadBalancing::Location, TAO_LB_Location_Map_Entry *>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry<PortableGroup::Location, TAO_LB_Location_Map_Entry *>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/LB_Location_Map.h b/TAO/orbsvcs/orbsvcs/LB_Location_Map.h
index d03947d6a2f..c2e3924a938 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Location_Map.h
+++ b/TAO/orbsvcs/orbsvcs/LB_Location_Map.h
@@ -24,6 +24,7 @@
 
 #include "ace/Hash_Map_Manager_T.h"
 #include "orbsvcs/LoadBalancingC.h"
+#include "orbsvcs/PortableGroupC.h"
 
 #include "LB_ReplicaInfo.h"
 #include "LB_Location_Hash.h"
@@ -55,7 +56,7 @@ struct TAO_LB_Location_Map_Entry
 
 /// Location hash map.
 typedef ACE_Hash_Map_Manager_Ex<
-  LoadBalancing::Location,
+  PortableGroup::Location,
   TAO_LB_Location_Map_Entry *,
   TAO_LB_Location_Hash,
   TAO_LB_Location_Equal_To,
diff --git a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.cpp
index d825b811afb..c4a3dc365e8 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.cpp
@@ -3,7 +3,7 @@
 #include "LB_Minimum_Dispersion.h"
 #include "LB_Location_Map.h"
 #include "LB_ObjectGroup_Map.h"
-//#include "ReplicaProxy.h"
+#include "orbsvcs/LoadBalancingC.h"
 
 ACE_RCSID (LoadBalancing,
            LB_Minimum_Dispersion,
diff --git a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h
index 34a25bcbbde..af388ef2baa 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h
+++ b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h
@@ -22,7 +22,6 @@
 #   pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/LoadBalancingS.h"
 #include "ace/Containers.h"
 #include "ace/Synch.h"
 
@@ -70,9 +69,9 @@ public:
 
 private:
 
-//   /// Lock used to ensure atomic access to state retained by this
-//   /// class.
-//   TAO_SYNCH_MUTEX lock_;
+  /// Lock used to ensure atomic access to state retained by this
+  /// class.
+  /// TAO_SYNCH_MUTEX lock_;
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp
index df9c223580a..a9638baeb77 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp
@@ -21,40 +21,40 @@ TAO_LB_ObjectGroupManager::TAO_LB_ObjectGroupManager (
 {
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LB_ObjectGroupManager::create_member (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
-    const LoadBalancing::Location & /* the_location */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
+    const PortableGroup::Location & /* the_location */,
     const char * /* type_id */,
-    const LoadBalancing::Criteria & /* the_criteria */,
+    const PortableGroup::Criteria & /* the_criteria */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberAlreadyPresent,
-                   LoadBalancing::NoFactory,
-                   LoadBalancing::ObjectNotCreated,
-                   LoadBalancing::InvalidCriteria,
-                   LoadBalancing::CannotMeetCriteria))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberAlreadyPresent,
+                   PortableGroup::NoFactory,
+                   PortableGroup::ObjectNotCreated,
+                   PortableGroup::InvalidCriteria,
+                   PortableGroup::CannotMeetCriteria))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    LoadBalancing::ObjectGroup::_nil ());
+                    PortableGroup::ObjectGroup::_nil ());
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LB_ObjectGroupManager::add_member (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
-    const LoadBalancing::Location & /* the_location */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
+    const PortableGroup::Location & /* the_location */,
     CORBA::Object_ptr /* member */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberAlreadyPresent,
-                   LoadBalancing::ObjectNotAdded))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberAlreadyPresent,
+                   PortableGroup::ObjectNotAdded))
 {
 #if 0
   TAO_LB_ObjectGroup_Map_Entry group_entry =
     this->object_group_map_.get_group_entry (object_group, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (LoadBalancing::ObjectGroup::_nil ());
+  ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
 
   ACE_NEW_THROW_EX (replica_info,
                     TAO_LB_Replica_Info,
@@ -63,7 +63,7 @@ TAO_LB_ObjectGroupManager::add_member (
                         TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (LoadBalancing::ObjectGroup::_nil ());
+  ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
 
   auto_ptr<TAO_LB_Replica_Info> safe_replica_info = replica_info;
 
@@ -71,50 +71,50 @@ TAO_LB_ObjectGroupManager::add_member (
 
   int result = this->location_map_.bind (the_location, member);
   if (result == 1)
-    ACE_THROW_RETURN (LoadBalancing::MemberAlreadyPresent (),
-                      LoadBalancing::ObjectGroup::_nil ());
+    ACE_THROW_RETURN (PortableGroup::MemberAlreadyPresent (),
+                      PortableGroup::ObjectGroup::_nil ());
   else if (result == -1)
-    ACE_THROW_RETURN (LoadBalancing::ObjectNotAdded (),
-                      LoadBalancing::ObjectGroup::_nil ());
+    ACE_THROW_RETURN (PortableGroup::ObjectNotAdded (),
+                      PortableGroup::ObjectGroup::_nil ());
 
   // Transfer ownership to the location map.
   (void) obj._retn ();
 #else
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    LoadBalancing::ObjectGroup::_nil ());
+                    PortableGroup::ObjectGroup::_nil ());
 #endif  /* 0 */
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LB_ObjectGroupManager::remove_member (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
-    const LoadBalancing::Location & /* the_location */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
+    const PortableGroup::Location & /* the_location */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberNotFound))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberNotFound))
 {
   // @@ DO NOT REMOVE MEMBER IF ITS GENERICFACTORY REFERENCE IS NOT
   //    NIL!
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    LoadBalancing::ObjectGroup::_nil ());
+                    PortableGroup::ObjectGroup::_nil ());
 }
 
-LoadBalancing::Locations *
+PortableGroup::Locations *
 TAO_LB_ObjectGroupManager::locations_of_members (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
 #if 0
   TAO_LB_ObjectGroup_Map_Entry group_entry =
     this->get_group_entry (object_group, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (LoadBalancing::ObjectGroup::_nil ());
+  ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
 
-  LoadBalancing::Locations *temp = 0;
+  PortableGroup::Locations *temp = 0;
   ACE_NEW_THROW_EX (temp,
-                    LoadBalancing::Locations,
+                    PortableGroup::Locations,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
                         TAO_DEFAULT_MINOR_CODE,
@@ -122,7 +122,7 @@ TAO_LB_ObjectGroupManager::locations_of_members (
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
-  LoadBalancing::Locations_var locations = temp;
+  PortableGroup::Locations_var locations = temp;
 
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, guard, object_group->lock);
@@ -147,35 +147,35 @@ TAO_LB_ObjectGroupManager::locations_of_members (
 #endif  /* 0 */
 }
 
-LoadBalancing::ObjectGroupId
+PortableGroup::ObjectGroupId
 TAO_LB_ObjectGroupManager::get_object_group_id (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LB_ObjectGroupManager::get_object_group_ref (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    LoadBalancing::ObjectGroup::_nil ());
+                    PortableGroup::ObjectGroup::_nil ());
 }
 
 CORBA::Object_ptr
 TAO_LB_ObjectGroupManager::get_member_ref (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
-    const LoadBalancing::Location & /* loc */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
+    const PortableGroup::Location & /* loc */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberNotFound))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberNotFound))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
                     CORBA::Object::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.h
index 3a8531b7584..e2ace809124 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.h
@@ -16,7 +16,7 @@
 
 #include "ace/pre.h"
 
-#include "orbsvcs/LoadBalancingC.h"
+#include "orbsvcs/PortableGroupC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -33,13 +33,13 @@ class TAO_LB_PropertyManager;
 /**
  * @class TAO_LB_ObjectGroupManager
  *
- * @brief LoadBalancing::ObjectGroupManager implementation.
+ * @brief PortableGroup::ObjectGroupManager implementation.
  *
  * The ObjectGroupManager provides the interface necessary to
  * facilitate application-controlled object group membership.
  */
 class TAO_LB_ObjectGroupManager
-  : public virtual LoadBalancing::ObjectGroupManager
+  : public virtual PortableGroup::ObjectGroupManager
 {
 public:
 
@@ -49,36 +49,36 @@ public:
                              TAO_LB_PropertyManager &property_manager);
 
   /**
-   * @name TAO_LoadBalancer::ObjectGroupManager methods
+   * @name PortableGroup::ObjectGroupManager methods
    */
   //@{
 
   /// Create a member using the load balancer ObjectGroupManager, and
   /// add the created object to the ObjectGroup.
-  virtual LoadBalancing::ObjectGroup_ptr create_member (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  virtual PortableGroup::ObjectGroup_ptr create_member (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       const char * type_id,
-      const LoadBalancing::Criteria & the_criteria,
+      const PortableGroup::Criteria & the_criteria,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberAlreadyPresent,
-                     LoadBalancing::NoFactory,
-                     LoadBalancing::ObjectNotCreated,
-                     LoadBalancing::InvalidCriteria,
-                     LoadBalancing::CannotMeetCriteria));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberAlreadyPresent,
+                     PortableGroup::NoFactory,
+                     PortableGroup::ObjectNotCreated,
+                     PortableGroup::InvalidCriteria,
+                     PortableGroup::CannotMeetCriteria));
 
   /// Add an existing object to the ObjectGroup.
-  virtual LoadBalancing::ObjectGroup_ptr add_member (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  virtual PortableGroup::ObjectGroup_ptr add_member (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       CORBA::Object_ptr member,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberAlreadyPresent,
-                     LoadBalancing::ObjectNotAdded));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberAlreadyPresent,
+                     PortableGroup::ObjectNotAdded));
 
   /**
    * Remove an object at a specific location from the given
@@ -87,45 +87,45 @@ public:
    * infrastructure (load balancer) will be deleted by the
    * infrastructure.
    */
-  virtual LoadBalancing::ObjectGroup_ptr remove_member (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  virtual PortableGroup::ObjectGroup_ptr remove_member (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberNotFound));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
-  virtual LoadBalancing::Locations * locations_of_members (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::Locations * locations_of_members (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   /// Return the ObjectGroupId for the given ObjectGroup.
   /// @note Does this method make sense for load balanced objects?
-  virtual LoadBalancing::ObjectGroupId get_object_group_id (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::ObjectGroupId get_object_group_id (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   /// @note Does this method make sense for load balanced objects?
-  virtual LoadBalancing::ObjectGroup_ptr get_object_group_ref (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   /// Return the reference corresponding to the Replica of a given
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & loc,
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & loc,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberNotFound));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberNotFound));
 
   //@}
 
@@ -137,18 +137,18 @@ public:
 
   /// Create a member using the load balancer ObjectGroupManager, and
   /// add the created object to the ObjectGroup.
-  LoadBalancing::ObjectGroup_ptr create_member_i (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  PortableGroup::ObjectGroup_ptr create_member_i (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       const char * type_id,
-      const LoadBalancing::Criteria & the_criteria,
+      const PortableGroup::Criteria & the_criteria,
       CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::MemberAlreadyPresent,
-                     LoadBalancing::NoFactory,
-                     LoadBalancing::ObjectNotCreated,
-                     LoadBalancing::InvalidCriteria,
-                     LoadBalancing::CannotMeetCriteria));
+                     PortableGroup::MemberAlreadyPresent,
+                     PortableGroup::NoFactory,
+                     PortableGroup::ObjectNotCreated,
+                     PortableGroup::InvalidCriteria,
+                     PortableGroup::CannotMeetCriteria));
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Equal_To.h b/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Equal_To.h
index 33eccb6d71f..c8686822f9a 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Equal_To.h
+++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Equal_To.h
@@ -41,8 +41,8 @@ class TAO_LB_ObjectGroup_Equal_To
 
 public:
 
-  int operator() (const TAO_LoadBalancing::ObjectGroup_ptr &lhs,
-                  const TAO_LoadBalancing::ObjectGroup_ptr &rhs) const;
+  int operator() (const TAO_PortableGroup::ObjectGroup_ptr &lhs,
+                  const TAO_PortableGroup::ObjectGroup_ptr &rhs) const;
   // Invokes the CORBA::Object::_is_equivalent() method to determine
   // if both references refer to the same object group.  However, this
   // is a weak test since is_equivalent() can only conclusively
@@ -64,8 +64,8 @@ class TAO_LB_FactoryCreationId_Equal_To
 public:
 
   int operator() (
-    const TAO_LoadBalancing::FactoryCreationId &lhs,
-    const TAO_LoadBalancing::FactoryCreationId &rhs) const;
+    const TAO_PortableGroup::FactoryCreationId &lhs,
+    const TAO_PortableGroup::FactoryCreationId &rhs) const;
   // Check if two FactoryCreationId values are the same.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Equal_To.inl b/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Equal_To.inl
index 7547d068b72..06d21705941 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Equal_To.inl
+++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Equal_To.inl
@@ -4,11 +4,11 @@
 
 ACE_INLINE int
 TAO_LB_ObjectGroup_Equal_To::operator() (
-  const TAO_LoadBalancing::ObjectGroup_ptr &lhs,
-  const TAO_LoadBalancing::ObjectGroup_ptr &rhs) const
+  const TAO_PortableGroup::ObjectGroup_ptr &lhs,
+  const TAO_PortableGroup::ObjectGroup_ptr &rhs) const
 {
   // As with all CORBA objects, the
-  // TAO_LoadBalancing::ObjectGroup::is_equivalent() returns 1 if two
+  // TAO_PortableGroup::ObjectGroup::is_equivalent() returns 1 if two
   // references refer to the same object.  However, it is possible
   // that is_equivalent() may return 0 even if both references refer
   // to the same object.
@@ -19,8 +19,8 @@ TAO_LB_ObjectGroup_Equal_To::operator() (
 
 ACE_INLINE int
 TAO_LB_FactoryCreationId_Equal_To::operator() (
-  const TAO_LoadBalancing::FactoryCreationId &lhs,
-  const TAO_LoadBalancing::FactoryCreationId &rhs) const
+  const TAO_PortableGroup::FactoryCreationId &lhs,
+  const TAO_PortableGroup::FactoryCreationId &rhs) const
 {
   // A Load Balancer FactoryCreationId is simply a CORBA::ULong.
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Hash.h b/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Hash.h
index 488fa7bbc93..c89640a025f 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Hash.h
+++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Hash.h
@@ -40,7 +40,7 @@ class TAO_LB_ObjectGroup_Hash
 
 public:
 
-  CORBA::ULong operator() (const TAO_LoadBalancing::ObjectGroup_ptr &) const;
+  CORBA::ULong operator() (const TAO_PortableGroup::ObjectGroup_ptr &) const;
   // Invokes the _hash() method on the ObjectGroup reference.
 };
 
@@ -56,7 +56,7 @@ class TAO_LB_FactoryCreationId_Hash
 
 public:
 
-  CORBA::ULong operator() (const TAO_LoadBalancing::FactoryCreationId &) const;
+  CORBA::ULong operator() (const TAO_PortableGroup::FactoryCreationId &) const;
   // Generates a hash value based on the contents of the
   // FactoryCreationId.
 };
diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Hash.inl b/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Hash.inl
index fe12be1ad3f..2c3c16cc2d8 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Hash.inl
+++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Hash.inl
@@ -4,7 +4,7 @@
 
 ACE_INLINE CORBA::ULong
 TAO_LB_ObjectGroup_Hash::operator() (
-  const TAO_LoadBalancing::ObjectGroup_ptr &object_group) const
+  const TAO_PortableGroup::ObjectGroup_ptr &object_group) const
 {
   CORBA::ULong max = 4294967295UL;  // Maximum 32-bit unsigned integer
   return object_group->_hash (max);
@@ -14,7 +14,7 @@ TAO_LB_ObjectGroup_Hash::operator() (
 
 ACE_INLINE CORBA::ULong
 TAO_LB_FactoryCreationId_Hash::operator() (
-  const TAO_LoadBalancing::FactoryCreationId &factory_creation_id) const
+  const TAO_PortableGroup::FactoryCreationId &factory_creation_id) const
 {
   // A Load Balancer FactoryCreationId is simply a CORBA::ULong.
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Map.cpp b/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Map.cpp
index 7370cbf1078..0b4f1a96032 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Map.cpp
@@ -50,7 +50,7 @@ TAO_LB_ObjectGroup_Map::get_group_entry (
     CORBA::Object_ptr object_group,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   if (CORBA::is_nil (this->poa_.in ()))
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
@@ -61,7 +61,7 @@ TAO_LB_ObjectGroup_Map::get_group_entry (
 
   TAO_LB_ObjectGroup_Map_Entry *group_entry = 0;
   if (this->table_.find (oid.in (), group_entry) != 0)
-    ACE_THROW_RETURN (LoadBalancing::ObjectGroupNotFound (),
+    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (),
                       0);
 
   return group_entry;
diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Map.h
index 50a35542e22..feccacfbd07 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Map.h
+++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroup_Map.h
@@ -44,7 +44,7 @@ public:
   CORBA::String_var type_id;
 
   /// Reference to the ObjectGroup.
-  LoadBalancing::ObjectGroup_var object_group;
+  PortableGroup::ObjectGroup_var object_group;
 
   /// Unbounded set containing replica references and all related
   /// information for each replica.
@@ -52,7 +52,7 @@ public:
 
   /// Properties used when creating this object group, in addition
   /// those set dynamically after the creation.
-  LoadBalancing::Properties properties;
+  PortableGroup::Properties properties;
 
   /// Lock used to synchronize access to the ReplicaInfo set.
   TAO_SYNCH_MUTEX lock;
@@ -124,10 +124,10 @@ private:
   /// Obtain the ObjectGroup hash map entry corresponding to the given
   /// ObjectGroup reference.
   TAO_LB_ObjectGroup_Map_Entry *get_group_entry (
-      LoadBalancing::ObjectGroup_ptr object_group,
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/LB_PropertyManager.cpp
index 5bdf9d4daf1..95a91256355 100644
--- a/TAO/orbsvcs/orbsvcs/LB_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_PropertyManager.cpp
@@ -19,11 +19,11 @@ TAO_LB_PropertyManager::TAO_LB_PropertyManager (
 
 void
 TAO_LB_PropertyManager::set_default_properties (
-    const LoadBalancing::Properties & props,
+    const PortableGroup::Properties & props,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->validate_properties (props, ACE_TRY_ENV);
   ACE_CHECK;
@@ -35,16 +35,16 @@ TAO_LB_PropertyManager::set_default_properties (
   }
 }
 
-LoadBalancing::Properties *
+PortableGroup::Properties *
 TAO_LB_PropertyManager::get_default_properties (
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
-  LoadBalancing::Properties *props = 0;
+  PortableGroup::Properties *props = 0;
   ACE_NEW_THROW_EX (props,
-                    LoadBalancing::Properties (this->default_properties_),
+                    PortableGroup::Properties (this->default_properties_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
                         TAO_DEFAULT_MINOR_CODE,
@@ -57,11 +57,11 @@ TAO_LB_PropertyManager::get_default_properties (
 
 void
 TAO_LB_PropertyManager::remove_default_properties (
-    const LoadBalancing::Properties &props,
+    const PortableGroup::Properties &props,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->validate_properties (props, ACE_TRY_ENV);
   ACE_CHECK;
@@ -72,11 +72,11 @@ TAO_LB_PropertyManager::remove_default_properties (
 void
 TAO_LB_PropertyManager::set_type_properties (
     const char * /* type_id */,
-    const LoadBalancing::Properties & overrides,
+    const PortableGroup::Properties & overrides,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->validate_properties (overrides, ACE_TRY_ENV);
   ACE_CHECK;
@@ -84,7 +84,7 @@ TAO_LB_PropertyManager::set_type_properties (
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-LoadBalancing::Properties *
+PortableGroup::Properties *
 TAO_LB_PropertyManager::get_type_properties (
     const char * /* type_id */,
     CORBA::Environment &ACE_TRY_ENV)
@@ -96,11 +96,11 @@ TAO_LB_PropertyManager::get_type_properties (
 void
 TAO_LB_PropertyManager::remove_type_properties (
     const char * /* type_id */,
-    const LoadBalancing::Properties & props,
+    const PortableGroup::Properties & props,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->validate_properties (props, ACE_TRY_ENV);
   ACE_CHECK;
@@ -110,13 +110,13 @@ TAO_LB_PropertyManager::remove_type_properties (
 
 void
 TAO_LB_PropertyManager::set_properties_dynamically (
-    LoadBalancing::ObjectGroup_ptr /*object_group */,
-    const LoadBalancing::Properties & overrides,
+    PortableGroup::ObjectGroup_ptr /*object_group */,
+    const PortableGroup::Properties & overrides,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->validate_properties (overrides, ACE_TRY_ENV);
   ACE_CHECK;
@@ -124,12 +124,12 @@ TAO_LB_PropertyManager::set_properties_dynamically (
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-LoadBalancing::Properties *
+PortableGroup::Properties *
 TAO_LB_PropertyManager::get_properties (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
 #if 0
   TAO_LB_ObjectGroup_Map_Entry *entry =
@@ -141,7 +141,7 @@ TAO_LB_PropertyManager::get_properties (
   //  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, property_map_guard, this->lock_, 0);
 
   // Merge the type-properties into the list.
-  LoadBalancing::Properties &type_properties;
+  PortableGroup::Properties &type_properties;
   if (this->type_properties_.find (entry.in (), type_properties == 0))
     {
     }
@@ -156,10 +156,10 @@ TAO_LB_PropertyManager::get_properties (
 
 void
 TAO_LB_PropertyManager::validate_properties (
-    const LoadBalancing::Properties & props,
+    const PortableGroup::Properties & props,
     CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+  ACE_THROW_SPEC ((PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   // @todo FIXME!  Just a hack to get things going...
 
@@ -170,21 +170,21 @@ TAO_LB_PropertyManager::validate_properties (
                           "Factories") == 0)
         return;
       else if (ACE_OS::strcmp (props[i].nam[0].id,
-                          "InitialNumberReplicas") == 0)
+                          "InitialNumberMembers") == 0)
         return;
       else if (ACE_OS::strcmp (props[i].nam[0].id,
-                          "MinimumNumberReplicas") == 0)
+                          "MinimumNumberMembers") == 0)
         return;
       else
-        ACE_THROW (LoadBalancing::UnsupportedProperty (props[i].nam));
+        ACE_THROW (PortableGroup::UnsupportedProperty (props[i].nam));
     }
 }
 
 // void
 // TAO_LB_PropertyManager::process_criteria (
 //   const char *type_id,
-//   const LoadBalancing::Criteria &the_criteria,  // IN
-//   LoadBalancing::Properties &props,             // OUT
+//   const PortableGroup::Criteria &the_criteria,  // IN
+//   PortableGroup::Properties &props,             // OUT
 //   CORBA::Environment &ACE_TRY_ENV)
 // {
 //   this->validate_properties (the_criteria, ACE_TRY_ENV);
@@ -198,10 +198,10 @@ TAO_LB_PropertyManager::validate_properties (
 //     }
 // }
 
-LoadBalancing::InitialNumberReplicas
-TAO_LB_PropertyManager::initial_number_replicas (
+PortableGroup::InitialNumberMembersValue
+TAO_LB_PropertyManager::initial_number_members (
   const char * /* type_id */,
-  const LoadBalancing::Criteria &the_criteria,
+  const PortableGroup::Criteria &the_criteria,
   CORBA::Environment &ACE_TRY_ENV) const
 {
   // @@ Hack to get things going.
@@ -212,14 +212,14 @@ TAO_LB_PropertyManager::initial_number_replicas (
   for (CORBA::ULong i = 0; i < len; ++i)
     {
       if (ACE_OS::strcmp (the_criteria[i].nam[0].id,
-                          "InitialNumberReplicas") == 0)
+                          "InitialNumberMembers") == 0)
         {
-          LoadBalancing::InitialNumberReplicas initial_number_replicas = 0;
+          PortableGroup::InitialNumberMembersValue initial_number_members = 0;
 
-          if (the_criteria[i].val >>= initial_number_replicas)
-            return initial_number_replicas;
+          if (the_criteria[i].val >>= initial_number_members)
+            return initial_number_members;
           else
-            ACE_THROW_RETURN (LoadBalancing::InvalidProperty (
+            ACE_THROW_RETURN (PortableGroup::InvalidProperty (
                                 the_criteria[i].nam,
                                 the_criteria[i].val),
                               0);
@@ -234,10 +234,10 @@ TAO_LB_PropertyManager::initial_number_replicas (
   return 0;  // @@ FIXME
 }
 
-LoadBalancing::FactoryInfos *
+PortableGroup::FactoryInfos *
 TAO_LB_PropertyManager::factory_infos (
   const char * /* type_id */,
-  const LoadBalancing::Criteria &the_criteria,
+  const PortableGroup::Criteria &the_criteria,
   CORBA::Environment &ACE_TRY_ENV) const
 {
   // @@ Hack to get things going.
@@ -250,16 +250,16 @@ TAO_LB_PropertyManager::factory_infos (
       if (ACE_OS::strcmp (the_criteria[i].nam[0].id,
                           "Factories") == 0)
         {
-          LoadBalancing::FactoryInfos *tmp = 0;
+          PortableGroup::FactoryInfos *tmp = 0;
 
           if (the_criteria[i].val >>= tmp)
             {
               // The Any retains ownership of the data, so we need to
               // return a copy.
-              LoadBalancing::FactoryInfos *factory_infos = 0;
+              PortableGroup::FactoryInfos *factory_infos = 0;
               ACE_NEW_THROW_EX (
                 factory_infos,
-                LoadBalancing::FactoryInfos (*tmp),
+                PortableGroup::FactoryInfos (*tmp),
                 CORBA::NO_MEMORY (
                   CORBA::SystemException::_tao_minor_code (
                     TAO_DEFAULT_MINOR_CODE,
@@ -270,7 +270,7 @@ TAO_LB_PropertyManager::factory_infos (
               return factory_infos;
             }
           else
-            ACE_THROW_RETURN (LoadBalancing::InvalidProperty (
+            ACE_THROW_RETURN (PortableGroup::InvalidProperty (
                                 the_criteria[i].nam,
                                 the_criteria[i].val),
                               0);
@@ -289,19 +289,19 @@ TAO_LB_PropertyManager::factory_infos (
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 // Type-specific property hash map template instantiations
-template class ACE_Hash_Map_Entry<const char *, LoadBalancing::Properties>;
-template class ACE_Hash_Map_Manager_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Entry<const char *, PortableGroup::Properties>;
+template class ACE_Hash_Map_Manager_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 // Type-specific property hash map template instantiations
-#pragma instantiate ACE_Hash_Map_Entry<const char *, LoadBalancing::Properties>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Entry<const char *, PortableGroup::Properties>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/LB_PropertyManager.h b/TAO/orbsvcs/orbsvcs/LB_PropertyManager.h
index 06260ad4a49..4ed24c6b7d9 100644
--- a/TAO/orbsvcs/orbsvcs/LB_PropertyManager.h
+++ b/TAO/orbsvcs/orbsvcs/LB_PropertyManager.h
@@ -24,6 +24,7 @@
 
 #include "ace/Functor.h"
 #include "ace/Hash_Map_Manager_T.h"
+#include "orbsvcs/PortableGroupC.h"
 #include "orbsvcs/LoadBalancingC.h"
 
 
@@ -34,7 +35,7 @@ class TAO_LB_ObjectGroup_Map;
 /**
  * @class TAO_LB_PropertyManager
  *
- * @brief Class that implements the LoadBalancing::PropertyManager
+ * @brief Class that implements the PortableGroup::PropertyManager
  *        interface.
  *
  * Only the default and type-specific properties are housed in this
@@ -44,7 +45,7 @@ class TAO_LB_ObjectGroup_Map;
  * PropertyManager is still used to manage those properties.
  */
 class TAO_LB_PropertyManager
-  : public virtual LoadBalancing::PropertyManager
+  : public virtual PortableGroup::PropertyManager
 {
 public:
 
@@ -52,47 +53,47 @@ public:
   TAO_LB_PropertyManager (TAO_LB_ObjectGroup_Map &object_group_map);
 
   /**
-   * @name TAO_LoadBalancer::PropertyManager methods
+   * @name PortableGroup::PropertyManager methods
    */
   //@{
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const LoadBalancing::Properties & props,
+      const PortableGroup::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /// Get the default properties used by all object groups.
-  virtual LoadBalancing::Properties * get_default_properties (
+  virtual PortableGroup::Properties * get_default_properties (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const LoadBalancing::Properties & props,
+      const PortableGroup::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /// Set properties associated with a given Replica type.  These
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const LoadBalancing::Properties & overrides,
+      const PortableGroup::Properties & overrides,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * Return the properties associated with a give Replica type.  These
    * properties include the type-specific properties in use, in
    * addition to the default properties that were not overridden.
    */
-  virtual LoadBalancing::Properties * get_type_properties (
+  virtual PortableGroup::Properties * get_type_properties (
       const char * type_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -100,11 +101,11 @@ public:
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const LoadBalancing::Properties & props,
+      const PortableGroup::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * Dynamically set the properties associated with a given object
@@ -113,13 +114,13 @@ public:
    * properties.
    */
   virtual void set_properties_dynamically (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Properties & overrides,
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Properties & overrides,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * Return the properties currently in use by the given object
@@ -128,21 +129,21 @@ public:
    * were used when the replica was created, and default properties
    * that weren't overridden.
    */
-  virtual LoadBalancing::Properties * get_properties (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::Properties * get_properties (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   //@}
 
 
   /// Verify that the given properties are valid and/or supported by
   /// the Load Balancer.
-  void validate_properties (const LoadBalancing::Properties &props,
+  void validate_properties (const PortableGroup::Properties &props,
                             CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+    ACE_THROW_SPEC ((PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * @name TAO-specific Load Balancing PropertyManager Helper Methods
@@ -155,7 +156,7 @@ public:
   //@{
 
   /// Return the membership style for the given object group.
-  LoadBalancing::MembershipStyle membership_style (
+  PortableGroup::MembershipStyleValue membership_style (
     CORBA::Object_ptr object_group) const;
 
   /// Return the load monitoring style for the given object group.
@@ -169,21 +170,21 @@ public:
 
   /// Return the initial number of replicas for the given object
   /// group.
-  LoadBalancing::InitialNumberReplicas
-    initial_number_replicas (const char *type_id,
-                             const LoadBalancing::Criteria &the_criteria,
-                             CORBA::Environment &ACE_TRY_ENV) const;
+  PortableGroup::InitialNumberMembersValue
+    initial_number_members (const char *type_id,
+                            const PortableGroup::Criteria &the_criteria,
+                            CORBA::Environment &ACE_TRY_ENV) const;
 
   /// Return the minimum number of replicas for the given object
   /// group.
-  LoadBalancing::MinimumNumberReplicas
-    minimum_number_replicas (CORBA::Object_ptr object_group) const;
+  PortableGroup::MinimumNumberMembersValue
+    minimum_number_members (CORBA::Object_ptr object_group) const;
 
   /// Return the sequence FactoryInfos associated with the given
   /// object group.
-  LoadBalancing::FactoryInfos *
+  PortableGroup::FactoryInfos *
     factory_infos (const char *type_id,
-                   const LoadBalancing::Criteria &the_criteria,
+                   const PortableGroup::Criteria &the_criteria,
                    CORBA::Environment &ACE_TRY_ENV) const;
 
   //@}
@@ -191,7 +192,7 @@ public:
   /// Type-specific property hash map.
   typedef ACE_Hash_Map_Manager_Ex<
     const char *,
-    LoadBalancing::Properties,
+    PortableGroup::Properties,
     ACE_Hash<const char *>,
     ACE_Equal_To<const char *>,
     ACE_Null_Mutex> Type_Prop_Table;
@@ -202,7 +203,7 @@ private:
   TAO_LB_ObjectGroup_Map &object_group_map_;
 
   /// Default properties.
-  LoadBalancing::Properties default_properties_;
+  PortableGroup::Properties default_properties_;
 
   /// Table of type-specific object group properties.
   Type_Prop_Table type_properties_;
diff --git a/TAO/orbsvcs/orbsvcs/LB_RPMS_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LB_RPMS_Monitor.cpp
index e17901eff88..76e2bc00290 100644
--- a/TAO/orbsvcs/orbsvcs/LB_RPMS_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_RPMS_Monitor.cpp
@@ -37,7 +37,7 @@ TAO_LB_RPMS_Monitor::init (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK;
 }
 
-LoadBalancing::LoadList *
+PortableGroup::LoadList *
 TAO_LB_RPMS_Monitor::current_load (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -49,9 +49,9 @@ TAO_LB_RPMS_Monitor::current_load (CORBA::Environment &ACE_TRY_ENV)
   // This optimization won't make a difference on single-threaded
   // server replicas.
 
-  LoadBalancing::LoadList *tmp_loads = 0;
+  PortableGroup::LoadList *tmp_loads = 0;
   ACE_NEW_THROW_EX (tmp_loads,
-                    LoadBalancing::LoadList,
+                    PortableGroup::LoadList,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
                         TAO_DEFAULT_MINOR_CODE,
@@ -59,7 +59,7 @@ TAO_LB_RPMS_Monitor::current_load (CORBA::Environment &ACE_TRY_ENV)
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
-  LoadBalancing::LoadList_var loads = tmp_loads;
+  PortableGroup::LoadList_var loads = tmp_loads;
 
   loads->length (1);
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_RPMS_Monitor.h b/TAO/orbsvcs/orbsvcs/LB_RPMS_Monitor.h
index abea8ec744b..a5fd7ce021e 100644
--- a/TAO/orbsvcs/orbsvcs/LB_RPMS_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LB_RPMS_Monitor.h
@@ -48,7 +48,7 @@ public:
   TAO_LB_RPMS_Monitor (void);
 
   /**
-   * @name LoadBalancing::LoadMonitor Methods
+   * @name PortableGroup::LoadMonitor Methods
    */
   //@{
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h b/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h
index 7a63f3a5d22..69cc02813bd 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h
@@ -46,12 +46,12 @@ struct TAO_LB_ReplicaInfo
   CORBA::Object_var replica;
 
   /// FactoryInfo used when creating the replica.
-  LoadBalancing::FactoryInfo factory_info;
+  PortableGroup::FactoryInfo factory_info;
 
   /// FactoryCreationId assigned to this replica.  This
   /// FactoryCreationId_var will contain a zero pointer if the replica
   /// was not created using a GenericFactory.
-  LoadBalancing::GenericFactory::FactoryCreationId_var factory_creation_id;
+  PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id;
 
   /// Pointer to the object group map entry corresponding to the
   /// object group to which this replica member in this structure
diff --git a/TAO/orbsvcs/orbsvcs/LB_Replica_Equal_To.h b/TAO/orbsvcs/orbsvcs/LB_Replica_Equal_To.h
index 0192ebf7dc7..32b22866e6c 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Replica_Equal_To.h
+++ b/TAO/orbsvcs/orbsvcs/LB_Replica_Equal_To.h
@@ -64,8 +64,8 @@ class TAO_LB_Location_Equal_To
 
 public:
 
-  int operator() (const TAO_LoadBalancing::Location &lhs,
-                  const TAO_LoadBalancing::Location &rhs) const;
+  int operator() (const TAO_PortableGroup::Location &lhs,
+                  const TAO_PortableGroup::Location &rhs) const;
   // Iterate through the contents of each Location until a mismatch
   // occurs.  If no mismatch is found, then the Locations are
   // considered equal.
diff --git a/TAO/orbsvcs/orbsvcs/LB_Replica_Equal_To.inl b/TAO/orbsvcs/orbsvcs/LB_Replica_Equal_To.inl
index 29db9835b3c..6081cd73a84 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Replica_Equal_To.inl
+++ b/TAO/orbsvcs/orbsvcs/LB_Replica_Equal_To.inl
@@ -19,8 +19,8 @@ TAO_LB_Replica_Equal_To::operator() (
 
 ACE_INLINE int
 TAO_LB_Location_Equal_To::operator() (
-  const TAO_LoadBalancing::Location &lhs,
-  const TAO_LoadBalancing::Location &rhs) const
+  const TAO_PortableGroup::Location &lhs,
+  const TAO_PortableGroup::Location &rhs) const
 {
   size_t lhs_length = lhs.length ();
   size_t rhs_length = rhs.length ();
diff --git a/TAO/orbsvcs/orbsvcs/LB_Replica_Hash.h b/TAO/orbsvcs/orbsvcs/LB_Replica_Hash.h
index e220dadf48a..3b6f5d037da 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Replica_Hash.h
+++ b/TAO/orbsvcs/orbsvcs/LB_Replica_Hash.h
@@ -57,7 +57,7 @@ class TAO_LB_Location_Hash
 
 public:
 
-  CORBA::ULong operator() (const TAO_LoadBalancing::Location &) const;
+  CORBA::ULong operator() (const TAO_PortableGroup::Location &) const;
   // Generates a hash value based on the contents of the
   // Location.
 };
diff --git a/TAO/orbsvcs/orbsvcs/LB_Replica_Hash.inl b/TAO/orbsvcs/orbsvcs/LB_Replica_Hash.inl
index 450a9797e48..f3d6d1f0ca4 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Replica_Hash.inl
+++ b/TAO/orbsvcs/orbsvcs/LB_Replica_Hash.inl
@@ -12,7 +12,7 @@ TAO_LB_Replica_Hash::operator() (
 
 ACE_INLINE CORBA::ULong
 TAO_LB_Location_Hash::operator() (
-  const TAO_LoadBalancing::Location &location) const
+  const TAO_PortableGroup::Location &location) const
 {
   CORBA::ULong hash = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing.idl b/TAO/orbsvcs/orbsvcs/LoadBalancing.idl
index 8cecbb03874..97c7ba3ab0b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing.idl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing.idl
@@ -18,7 +18,8 @@
 #ifndef TAO_LOADBALANCING_IDL
 #define TAO_LOADBALANCING_IDL
 
-#include "tao/PortableInterceptor.pidl"
+//#include "tao/PortableInterceptor.pidl"
+#include "PortableGroup.idl"
 #include "CosNaming.idl"
 #include "orb.idl"
 
@@ -86,16 +87,16 @@ module LoadBalancing
     void register_load_notifier (in LoadNotifier load_notifier);
 
     LoadNotifier get_load_notifier ()
-      raises (InterfaceNotFound);
+      raises (PortableGroup::InterfaceNotFound);
 
     void register_load_monitor (in LoadMonitor load_monitor,
-                                in Location the_location)
+                                in PortableGroup::Location the_location)
       raises (MonitorAlreadyPresent);
 
-    LoadMonitor get_load_monitor (in Location the_location)
+    LoadMonitor get_load_monitor (in PortableGroup::Location the_location)
       raises (LocationNotFound);
 
-    void remove_load_monitor (in Location the_location)
+    void remove_load_monitor (in PortableGroup::Location the_location)
       raises (LocationNotFound);
   };
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.cpp
index 87c93109a22..6f7532ac4e5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.cpp
@@ -28,18 +28,18 @@ TAO_LB_GenericFactory::TAO_LB_GenericFactory (
 CORBA::Object_ptr
 TAO_LB_GenericFactory::create_object (
     const char * type_id,
-    const LoadBalancing::Criteria &the_criteria,
-    LoadBalancing::GenericFactory::FactoryCreationId_out
+    const PortableGroup::Criteria &the_criteria,
+    PortableGroup::GenericFactory::FactoryCreationId_out
       factory_creation_id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::NoFactory,
-                   LoadBalancing::ObjectNotCreated,
-                   LoadBalancing::InvalidCriteria,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::CannotMeetCriteria))
+                   PortableGroup::NoFactory,
+                   PortableGroup::ObjectNotCreated,
+                   PortableGroup::InvalidCriteria,
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::CannotMeetCriteria))
 {
-//   LoadBalancing::Properties_var properties =
+//   PortableGroup::Properties_var properties =
 //     this->property_manager_.get_type_properties (type_id,
 //                                                  ACE_TRY_ENV);
 //   ACE_CHECK_RETURN (CORBA::Object::_nil ());
@@ -50,14 +50,14 @@ TAO_LB_GenericFactory::create_object (
 //   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Extract the initial number of replicas to create.
-  LoadBalancing::InitialNumberReplicas initial_number_replicas =
-    this->property_manager_.initial_number_replicas (type_id,
+  PortableGroup::InitialNumberMembersValue initial_number_members =
+    this->property_manager_.initial_number_members (type_id,
                                                      the_criteria,
                                                      ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Extract the factory information for each of the replicas.
-  LoadBalancing::FactoryInfos_var factory_infos =
+  PortableGroup::FactoryInfos_var factory_infos =
     this->property_manager_.factory_infos (type_id,
                                            the_criteria,
                                            ACE_TRY_ENV);
@@ -68,8 +68,8 @@ TAO_LB_GenericFactory::create_object (
   // If the number of factories is less than the initial number of
   // replicas, then the desired number of replicas cannot possibly be
   // created.
-  if (factory_infos_count < initial_number_replicas)
-    ACE_THROW_RETURN (LoadBalancing::CannotMeetCriteria (),
+  if (factory_infos_count < initial_number_members)
+    ACE_THROW_RETURN (PortableGroup::CannotMeetCriteria (),
                       CORBA::Object::_nil ());
 
   TAO_LB_ObjectGroup_Map_Entry *object_group_entry = 0;
@@ -125,9 +125,9 @@ TAO_LB_GenericFactory::create_object (
 //     }
 
   // Allocate a new FactoryCreationId for use as an "out" parameter.
-  LoadBalancing::GenericFactory::FactoryCreationId *tmp = 0;
+  PortableGroup::GenericFactory::FactoryCreationId *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
-                    LoadBalancing::GenericFactory::FactoryCreationId,
+                    PortableGroup::GenericFactory::FactoryCreationId,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
                         TAO_DEFAULT_MINOR_CODE,
@@ -148,7 +148,7 @@ TAO_LB_GenericFactory::create_object (
   // Otherwise, an invalid object group entry would remain inside the
   // map.
   if (this->object_group_map_.bind (oid.in (), object_group_entry) != 0)
-    ACE_THROW_RETURN (LoadBalancing::ObjectNotCreated (),
+    ACE_THROW_RETURN (PortableGroup::ObjectNotCreated (),
                       CORBA::Object::_nil ());
 
   // No longer need to protect the allocated ObjectGroup_Map entry.
@@ -170,11 +170,11 @@ TAO_LB_GenericFactory::create_object (
 
 void
 TAO_LB_GenericFactory::delete_object (
-    const LoadBalancing::GenericFactory::FactoryCreationId &
+    const PortableGroup::GenericFactory::FactoryCreationId &
       factory_creation_id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectNotFound))
+                   PortableGroup::ObjectNotFound))
 {
   CORBA::ULong fcid = 0;
 
@@ -191,7 +191,7 @@ TAO_LB_GenericFactory::delete_object (
       TAO_LB_ObjectGroup_Map_Entry *object_group = 0;
 
       if (this->object_group_map_.find (oid.in (), object_group) == -1)
-        ACE_THROW (LoadBalancing::ObjectNotFound ());
+        ACE_THROW (PortableGroup::ObjectNotFound ());
 
       TAO_LB_ReplicaInfo_Set &replica_infos = object_group->replica_infos;
 
@@ -203,7 +203,7 @@ TAO_LB_GenericFactory::delete_object (
           {
             TAO_LB_ReplicaInfo *replica_info = (*i);
 
-            LoadBalancing::GenericFactory_ptr factory =
+            PortableGroup::GenericFactory_ptr factory =
               replica_info->factory_info.the_factory.in ();
 
             // If the factory reference is not nil, then the replica
@@ -211,7 +211,7 @@ TAO_LB_GenericFactory::delete_object (
             // factory deletes it.
             if (!CORBA::is_nil (factory))
               {
-                const LoadBalancing::GenericFactory::FactoryCreationId
+                const PortableGroup::GenericFactory::FactoryCreationId
                   &replica_fcid = replica_info->factory_creation_id.in ();
 
                 factory->delete_object (replica_fcid, ACE_TRY_ENV);
@@ -232,7 +232,7 @@ TAO_LB_GenericFactory::delete_object (
       delete object_group;
     }
   else
-    ACE_THROW (LoadBalancing::ObjectNotFound ());
+    ACE_THROW (PortableGroup::ObjectNotFound ());
 }
 
 void
@@ -244,7 +244,7 @@ TAO_LB_GenericFactory::poa (PortableServer::POA_ptr p)
 void
 TAO_LB_GenericFactory::populate_object_group (
   TAO_LB_ObjectGroup_Map_Entry *object_group_entry,
-  const LoadBalancing::FactoryInfos &factory_infos,
+  const PortableGroup::FactoryInfos &factory_infos,
   CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::ULong factory_infos_count = factory_infos.length ();
@@ -253,13 +253,13 @@ TAO_LB_GenericFactory::populate_object_group (
       TAO_LB_Location_Map_Entry *location_entry = 0;
       auto_ptr<TAO_LB_Location_Map_Entry> safe_location_entry;
 
-      const LoadBalancing::FactoryInfo &factory_info =
+      const PortableGroup::FactoryInfo &factory_info =
         factory_infos[j];
 
-      LoadBalancing::GenericFactory_ptr factory =
+      PortableGroup::GenericFactory_ptr factory =
         factory_info.the_factory.in ();
 
-      LoadBalancing::GenericFactory::FactoryCreationId_var
+      PortableGroup::GenericFactory::FactoryCreationId_var
         replica_fcid;
 
       CORBA::Object_var replica =
@@ -289,7 +289,7 @@ TAO_LB_GenericFactory::populate_object_group (
 
           if (this->location_map_.bind (factory_info.the_location,
                                         location_entry) != 0)
-            ACE_THROW (LoadBalancing::ObjectNotCreated ());
+            ACE_THROW (PortableGroup::ObjectNotCreated ());
         }
 
 #if 0
@@ -312,7 +312,7 @@ TAO_LB_GenericFactory::populate_object_group (
                                   ACE_TRY_ENV);
           ACE_CHECK;
 
-          ACE_THROW (LoadBalancing::NoFactory ());
+          ACE_THROW (PortableGroup::NoFactory ());
         }
 #endif  /* 0 */
 
@@ -337,7 +337,7 @@ TAO_LB_GenericFactory::populate_object_group (
           factory->delete_object (replica_fcid.in (), ACE_TRY_ENV);
           ACE_CHECK;
 
-          ACE_THROW (LoadBalancing::ObjectNotCreated ());
+          ACE_THROW (PortableGroup::ObjectNotCreated ());
         }
 
       replica_info->replica = replica;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.h
index bc077397c10..0d950dd28a5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.h
@@ -23,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/PortableServerC.h"
-#include "orbsvcs/LoadBalancingC.h"
+#include "orbsvcs/PortableGroupC.h"
 
 #include "LB_Location_Map.h"
 
@@ -37,7 +37,7 @@ struct TAO_LB_ObjectGroup_Map_Entry;
 /**
  * @class TAO_LB_GenericFactory
  *
- * @brief LoadBalancing::GenericFactory implementation used by the
+ * @brief PortableGroup::GenericFactory implementation used by the
  *        load balancer when creating object groups.
  *
  * This GenericFactory creates an object group reference for given set
@@ -45,7 +45,7 @@ struct TAO_LB_ObjectGroup_Map_Entry;
  * if the "infrastructure-controlled" membership style is configured.
  */
 class TAO_LB_GenericFactory
-  : public virtual LoadBalancing::GenericFactory
+  : public virtual PortableGroup::GenericFactory
 {
 public:
 
@@ -67,16 +67,16 @@ public:
    */
   virtual CORBA::Object_ptr create_object (
       const char * type_id,
-      const LoadBalancing::Criteria & the_criteria,
-      LoadBalancing::GenericFactory::FactoryCreationId_out
+      const PortableGroup::Criteria & the_criteria,
+      PortableGroup::GenericFactory::FactoryCreationId_out
         factory_creation_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::NoFactory,
-                     LoadBalancing::ObjectNotCreated,
-                     LoadBalancing::InvalidCriteria,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::CannotMeetCriteria));
+                     PortableGroup::NoFactory,
+                     PortableGroup::ObjectNotCreated,
+                     PortableGroup::InvalidCriteria,
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::CannotMeetCriteria));
 
   /**
    * Delete the object corresponding to the provided
@@ -85,11 +85,11 @@ public:
    * Afterward, the ObjectGroup itself will be deleted.
    */
   virtual void delete_object (
-      const LoadBalancing::GenericFactory::FactoryCreationId &
+      const PortableGroup::GenericFactory::FactoryCreationId &
         factory_creation_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectNotFound));
+                     PortableGroup::ObjectNotFound));
 
   //@}
 
@@ -103,7 +103,7 @@ private:
   /// object group being created.
   void populate_object_group (
          TAO_LB_ObjectGroup_Map_Entry *entry,
-         const LoadBalancing::FactoryInfos &factory_infos,
+         const PortableGroup::FactoryInfos &factory_infos,
          CORBA::Environment &ACE_TRY_ENV);
 
   /// Get a new ObjectId to be used when creating a new ObjectGroup.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Equal_To.h
index ce73458b3cd..f7fa74dbdd9 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Equal_To.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Equal_To.h
@@ -31,7 +31,7 @@
  *        names are the same.
  *
  * This functor simply does a string comparison of each of the
- * elements in the given TAO_LoadBalancing::Location name sequences.
+ * elements in the given TAO_PortableGroup::Location name sequences.
  */
 class TAO_LB_Location_Equal_To
 {
@@ -39,8 +39,8 @@ public:
 
   /// Perform a string comparison on each of the sequence elements in
   /// the given locations.
-  int operator() (const LoadBalancing::Location &lhs,
-                  const LoadBalancing::Location &rhs) const;
+  int operator() (const PortableGroup::Location &lhs,
+                  const PortableGroup::Location &rhs) const;
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Equal_To.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Equal_To.inl
index c73be7e8ad5..9b3d2c794d5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Equal_To.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Equal_To.inl
@@ -2,8 +2,8 @@
 
 ACE_INLINE int
 TAO_LB_Location_Equal_To::operator () (
-  const LoadBalancing::Location &lhs,
-  const LoadBalancing::Location &rhs) const
+  const PortableGroup::Location &lhs,
+  const PortableGroup::Location &rhs) const
 {
   // @todo Interim implementation until we figure out what to do when a
   //       location has multiple components.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Hash.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Hash.h
index 47a21aec618..04be62fb559 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Hash.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Hash.h
@@ -35,7 +35,7 @@ class TAO_LB_Location_Hash
 public:
 
   /// Creates a hash based on all of elements of the given Location
-  CORBA::ULong operator() (const LoadBalancing::Location &) const;
+  CORBA::ULong operator() (const PortableGroup::Location &) const;
 };
 
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Hash.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Hash.inl
index 1174194abae..1a8f81379f7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Hash.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Hash.inl
@@ -4,7 +4,7 @@
 
 ACE_INLINE CORBA::ULong
 TAO_LB_Location_Hash::operator() (
-  const LoadBalancing::Location &location) const
+  const PortableGroup::Location &location) const
 {
   // @todo Interim implementation until we figure out what to do when a
   //       location has multiple components.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.cpp
index 8787bc9a0ff..ace3c27ccf5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.cpp
@@ -9,18 +9,18 @@ ACE_RCSID (LoadBalancing,
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Hash_Map_Entry<LoadBalancing::Location, TAO_LB_Location_Map_Entry *>;
-template class ACE_Hash_Map_Manager_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Entry<PortableGroup::Location, TAO_LB_Location_Map_Entry *>;
+template class ACE_Hash_Map_Manager_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Hash_Map_Entry<LoadBalancing::Location, TAO_LB_Location_Map_Entry *>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry<PortableGroup::Location, TAO_LB_Location_Map_Entry *>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.h
index d03947d6a2f..c2e3924a938 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.h
@@ -24,6 +24,7 @@
 
 #include "ace/Hash_Map_Manager_T.h"
 #include "orbsvcs/LoadBalancingC.h"
+#include "orbsvcs/PortableGroupC.h"
 
 #include "LB_ReplicaInfo.h"
 #include "LB_Location_Hash.h"
@@ -55,7 +56,7 @@ struct TAO_LB_Location_Map_Entry
 
 /// Location hash map.
 typedef ACE_Hash_Map_Manager_Ex<
-  LoadBalancing::Location,
+  PortableGroup::Location,
   TAO_LB_Location_Map_Entry *,
   TAO_LB_Location_Hash,
   TAO_LB_Location_Equal_To,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.cpp
index d825b811afb..c4a3dc365e8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.cpp
@@ -3,7 +3,7 @@
 #include "LB_Minimum_Dispersion.h"
 #include "LB_Location_Map.h"
 #include "LB_ObjectGroup_Map.h"
-//#include "ReplicaProxy.h"
+#include "orbsvcs/LoadBalancingC.h"
 
 ACE_RCSID (LoadBalancing,
            LB_Minimum_Dispersion,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h
index 34a25bcbbde..af388ef2baa 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h
@@ -22,7 +22,6 @@
 #   pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/LoadBalancingS.h"
 #include "ace/Containers.h"
 #include "ace/Synch.h"
 
@@ -70,9 +69,9 @@ public:
 
 private:
 
-//   /// Lock used to ensure atomic access to state retained by this
-//   /// class.
-//   TAO_SYNCH_MUTEX lock_;
+  /// Lock used to ensure atomic access to state retained by this
+  /// class.
+  /// TAO_SYNCH_MUTEX lock_;
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp
index df9c223580a..a9638baeb77 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp
@@ -21,40 +21,40 @@ TAO_LB_ObjectGroupManager::TAO_LB_ObjectGroupManager (
 {
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LB_ObjectGroupManager::create_member (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
-    const LoadBalancing::Location & /* the_location */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
+    const PortableGroup::Location & /* the_location */,
     const char * /* type_id */,
-    const LoadBalancing::Criteria & /* the_criteria */,
+    const PortableGroup::Criteria & /* the_criteria */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberAlreadyPresent,
-                   LoadBalancing::NoFactory,
-                   LoadBalancing::ObjectNotCreated,
-                   LoadBalancing::InvalidCriteria,
-                   LoadBalancing::CannotMeetCriteria))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberAlreadyPresent,
+                   PortableGroup::NoFactory,
+                   PortableGroup::ObjectNotCreated,
+                   PortableGroup::InvalidCriteria,
+                   PortableGroup::CannotMeetCriteria))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    LoadBalancing::ObjectGroup::_nil ());
+                    PortableGroup::ObjectGroup::_nil ());
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LB_ObjectGroupManager::add_member (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
-    const LoadBalancing::Location & /* the_location */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
+    const PortableGroup::Location & /* the_location */,
     CORBA::Object_ptr /* member */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberAlreadyPresent,
-                   LoadBalancing::ObjectNotAdded))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberAlreadyPresent,
+                   PortableGroup::ObjectNotAdded))
 {
 #if 0
   TAO_LB_ObjectGroup_Map_Entry group_entry =
     this->object_group_map_.get_group_entry (object_group, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (LoadBalancing::ObjectGroup::_nil ());
+  ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
 
   ACE_NEW_THROW_EX (replica_info,
                     TAO_LB_Replica_Info,
@@ -63,7 +63,7 @@ TAO_LB_ObjectGroupManager::add_member (
                         TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (LoadBalancing::ObjectGroup::_nil ());
+  ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
 
   auto_ptr<TAO_LB_Replica_Info> safe_replica_info = replica_info;
 
@@ -71,50 +71,50 @@ TAO_LB_ObjectGroupManager::add_member (
 
   int result = this->location_map_.bind (the_location, member);
   if (result == 1)
-    ACE_THROW_RETURN (LoadBalancing::MemberAlreadyPresent (),
-                      LoadBalancing::ObjectGroup::_nil ());
+    ACE_THROW_RETURN (PortableGroup::MemberAlreadyPresent (),
+                      PortableGroup::ObjectGroup::_nil ());
   else if (result == -1)
-    ACE_THROW_RETURN (LoadBalancing::ObjectNotAdded (),
-                      LoadBalancing::ObjectGroup::_nil ());
+    ACE_THROW_RETURN (PortableGroup::ObjectNotAdded (),
+                      PortableGroup::ObjectGroup::_nil ());
 
   // Transfer ownership to the location map.
   (void) obj._retn ();
 #else
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    LoadBalancing::ObjectGroup::_nil ());
+                    PortableGroup::ObjectGroup::_nil ());
 #endif  /* 0 */
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LB_ObjectGroupManager::remove_member (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
-    const LoadBalancing::Location & /* the_location */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
+    const PortableGroup::Location & /* the_location */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberNotFound))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberNotFound))
 {
   // @@ DO NOT REMOVE MEMBER IF ITS GENERICFACTORY REFERENCE IS NOT
   //    NIL!
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    LoadBalancing::ObjectGroup::_nil ());
+                    PortableGroup::ObjectGroup::_nil ());
 }
 
-LoadBalancing::Locations *
+PortableGroup::Locations *
 TAO_LB_ObjectGroupManager::locations_of_members (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
 #if 0
   TAO_LB_ObjectGroup_Map_Entry group_entry =
     this->get_group_entry (object_group, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (LoadBalancing::ObjectGroup::_nil ());
+  ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
 
-  LoadBalancing::Locations *temp = 0;
+  PortableGroup::Locations *temp = 0;
   ACE_NEW_THROW_EX (temp,
-                    LoadBalancing::Locations,
+                    PortableGroup::Locations,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
                         TAO_DEFAULT_MINOR_CODE,
@@ -122,7 +122,7 @@ TAO_LB_ObjectGroupManager::locations_of_members (
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
-  LoadBalancing::Locations_var locations = temp;
+  PortableGroup::Locations_var locations = temp;
 
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, guard, object_group->lock);
@@ -147,35 +147,35 @@ TAO_LB_ObjectGroupManager::locations_of_members (
 #endif  /* 0 */
 }
 
-LoadBalancing::ObjectGroupId
+PortableGroup::ObjectGroupId
 TAO_LB_ObjectGroupManager::get_object_group_id (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LB_ObjectGroupManager::get_object_group_ref (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    LoadBalancing::ObjectGroup::_nil ());
+                    PortableGroup::ObjectGroup::_nil ());
 }
 
 CORBA::Object_ptr
 TAO_LB_ObjectGroupManager::get_member_ref (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
-    const LoadBalancing::Location & /* loc */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
+    const PortableGroup::Location & /* loc */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberNotFound))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberNotFound))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
                     CORBA::Object::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h
index 3a8531b7584..e2ace809124 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h
@@ -16,7 +16,7 @@
 
 #include "ace/pre.h"
 
-#include "orbsvcs/LoadBalancingC.h"
+#include "orbsvcs/PortableGroupC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -33,13 +33,13 @@ class TAO_LB_PropertyManager;
 /**
  * @class TAO_LB_ObjectGroupManager
  *
- * @brief LoadBalancing::ObjectGroupManager implementation.
+ * @brief PortableGroup::ObjectGroupManager implementation.
  *
  * The ObjectGroupManager provides the interface necessary to
  * facilitate application-controlled object group membership.
  */
 class TAO_LB_ObjectGroupManager
-  : public virtual LoadBalancing::ObjectGroupManager
+  : public virtual PortableGroup::ObjectGroupManager
 {
 public:
 
@@ -49,36 +49,36 @@ public:
                              TAO_LB_PropertyManager &property_manager);
 
   /**
-   * @name TAO_LoadBalancer::ObjectGroupManager methods
+   * @name PortableGroup::ObjectGroupManager methods
    */
   //@{
 
   /// Create a member using the load balancer ObjectGroupManager, and
   /// add the created object to the ObjectGroup.
-  virtual LoadBalancing::ObjectGroup_ptr create_member (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  virtual PortableGroup::ObjectGroup_ptr create_member (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       const char * type_id,
-      const LoadBalancing::Criteria & the_criteria,
+      const PortableGroup::Criteria & the_criteria,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberAlreadyPresent,
-                     LoadBalancing::NoFactory,
-                     LoadBalancing::ObjectNotCreated,
-                     LoadBalancing::InvalidCriteria,
-                     LoadBalancing::CannotMeetCriteria));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberAlreadyPresent,
+                     PortableGroup::NoFactory,
+                     PortableGroup::ObjectNotCreated,
+                     PortableGroup::InvalidCriteria,
+                     PortableGroup::CannotMeetCriteria));
 
   /// Add an existing object to the ObjectGroup.
-  virtual LoadBalancing::ObjectGroup_ptr add_member (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  virtual PortableGroup::ObjectGroup_ptr add_member (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       CORBA::Object_ptr member,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberAlreadyPresent,
-                     LoadBalancing::ObjectNotAdded));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberAlreadyPresent,
+                     PortableGroup::ObjectNotAdded));
 
   /**
    * Remove an object at a specific location from the given
@@ -87,45 +87,45 @@ public:
    * infrastructure (load balancer) will be deleted by the
    * infrastructure.
    */
-  virtual LoadBalancing::ObjectGroup_ptr remove_member (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  virtual PortableGroup::ObjectGroup_ptr remove_member (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberNotFound));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
-  virtual LoadBalancing::Locations * locations_of_members (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::Locations * locations_of_members (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   /// Return the ObjectGroupId for the given ObjectGroup.
   /// @note Does this method make sense for load balanced objects?
-  virtual LoadBalancing::ObjectGroupId get_object_group_id (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::ObjectGroupId get_object_group_id (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   /// @note Does this method make sense for load balanced objects?
-  virtual LoadBalancing::ObjectGroup_ptr get_object_group_ref (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   /// Return the reference corresponding to the Replica of a given
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & loc,
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & loc,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberNotFound));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberNotFound));
 
   //@}
 
@@ -137,18 +137,18 @@ public:
 
   /// Create a member using the load balancer ObjectGroupManager, and
   /// add the created object to the ObjectGroup.
-  LoadBalancing::ObjectGroup_ptr create_member_i (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  PortableGroup::ObjectGroup_ptr create_member_i (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       const char * type_id,
-      const LoadBalancing::Criteria & the_criteria,
+      const PortableGroup::Criteria & the_criteria,
       CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::MemberAlreadyPresent,
-                     LoadBalancing::NoFactory,
-                     LoadBalancing::ObjectNotCreated,
-                     LoadBalancing::InvalidCriteria,
-                     LoadBalancing::CannotMeetCriteria));
+                     PortableGroup::MemberAlreadyPresent,
+                     PortableGroup::NoFactory,
+                     PortableGroup::ObjectNotCreated,
+                     PortableGroup::InvalidCriteria,
+                     PortableGroup::CannotMeetCriteria));
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Equal_To.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Equal_To.h
index 33eccb6d71f..c8686822f9a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Equal_To.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Equal_To.h
@@ -41,8 +41,8 @@ class TAO_LB_ObjectGroup_Equal_To
 
 public:
 
-  int operator() (const TAO_LoadBalancing::ObjectGroup_ptr &lhs,
-                  const TAO_LoadBalancing::ObjectGroup_ptr &rhs) const;
+  int operator() (const TAO_PortableGroup::ObjectGroup_ptr &lhs,
+                  const TAO_PortableGroup::ObjectGroup_ptr &rhs) const;
   // Invokes the CORBA::Object::_is_equivalent() method to determine
   // if both references refer to the same object group.  However, this
   // is a weak test since is_equivalent() can only conclusively
@@ -64,8 +64,8 @@ class TAO_LB_FactoryCreationId_Equal_To
 public:
 
   int operator() (
-    const TAO_LoadBalancing::FactoryCreationId &lhs,
-    const TAO_LoadBalancing::FactoryCreationId &rhs) const;
+    const TAO_PortableGroup::FactoryCreationId &lhs,
+    const TAO_PortableGroup::FactoryCreationId &rhs) const;
   // Check if two FactoryCreationId values are the same.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Equal_To.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Equal_To.inl
index 7547d068b72..06d21705941 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Equal_To.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Equal_To.inl
@@ -4,11 +4,11 @@
 
 ACE_INLINE int
 TAO_LB_ObjectGroup_Equal_To::operator() (
-  const TAO_LoadBalancing::ObjectGroup_ptr &lhs,
-  const TAO_LoadBalancing::ObjectGroup_ptr &rhs) const
+  const TAO_PortableGroup::ObjectGroup_ptr &lhs,
+  const TAO_PortableGroup::ObjectGroup_ptr &rhs) const
 {
   // As with all CORBA objects, the
-  // TAO_LoadBalancing::ObjectGroup::is_equivalent() returns 1 if two
+  // TAO_PortableGroup::ObjectGroup::is_equivalent() returns 1 if two
   // references refer to the same object.  However, it is possible
   // that is_equivalent() may return 0 even if both references refer
   // to the same object.
@@ -19,8 +19,8 @@ TAO_LB_ObjectGroup_Equal_To::operator() (
 
 ACE_INLINE int
 TAO_LB_FactoryCreationId_Equal_To::operator() (
-  const TAO_LoadBalancing::FactoryCreationId &lhs,
-  const TAO_LoadBalancing::FactoryCreationId &rhs) const
+  const TAO_PortableGroup::FactoryCreationId &lhs,
+  const TAO_PortableGroup::FactoryCreationId &rhs) const
 {
   // A Load Balancer FactoryCreationId is simply a CORBA::ULong.
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Hash.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Hash.h
index 488fa7bbc93..c89640a025f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Hash.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Hash.h
@@ -40,7 +40,7 @@ class TAO_LB_ObjectGroup_Hash
 
 public:
 
-  CORBA::ULong operator() (const TAO_LoadBalancing::ObjectGroup_ptr &) const;
+  CORBA::ULong operator() (const TAO_PortableGroup::ObjectGroup_ptr &) const;
   // Invokes the _hash() method on the ObjectGroup reference.
 };
 
@@ -56,7 +56,7 @@ class TAO_LB_FactoryCreationId_Hash
 
 public:
 
-  CORBA::ULong operator() (const TAO_LoadBalancing::FactoryCreationId &) const;
+  CORBA::ULong operator() (const TAO_PortableGroup::FactoryCreationId &) const;
   // Generates a hash value based on the contents of the
   // FactoryCreationId.
 };
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Hash.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Hash.inl
index fe12be1ad3f..2c3c16cc2d8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Hash.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Hash.inl
@@ -4,7 +4,7 @@
 
 ACE_INLINE CORBA::ULong
 TAO_LB_ObjectGroup_Hash::operator() (
-  const TAO_LoadBalancing::ObjectGroup_ptr &object_group) const
+  const TAO_PortableGroup::ObjectGroup_ptr &object_group) const
 {
   CORBA::ULong max = 4294967295UL;  // Maximum 32-bit unsigned integer
   return object_group->_hash (max);
@@ -14,7 +14,7 @@ TAO_LB_ObjectGroup_Hash::operator() (
 
 ACE_INLINE CORBA::ULong
 TAO_LB_FactoryCreationId_Hash::operator() (
-  const TAO_LoadBalancing::FactoryCreationId &factory_creation_id) const
+  const TAO_PortableGroup::FactoryCreationId &factory_creation_id) const
 {
   // A Load Balancer FactoryCreationId is simply a CORBA::ULong.
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Map.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Map.cpp
index 7370cbf1078..0b4f1a96032 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Map.cpp
@@ -50,7 +50,7 @@ TAO_LB_ObjectGroup_Map::get_group_entry (
     CORBA::Object_ptr object_group,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   if (CORBA::is_nil (this->poa_.in ()))
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
@@ -61,7 +61,7 @@ TAO_LB_ObjectGroup_Map::get_group_entry (
 
   TAO_LB_ObjectGroup_Map_Entry *group_entry = 0;
   if (this->table_.find (oid.in (), group_entry) != 0)
-    ACE_THROW_RETURN (LoadBalancing::ObjectGroupNotFound (),
+    ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (),
                       0);
 
   return group_entry;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Map.h
index 50a35542e22..feccacfbd07 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Map.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Map.h
@@ -44,7 +44,7 @@ public:
   CORBA::String_var type_id;
 
   /// Reference to the ObjectGroup.
-  LoadBalancing::ObjectGroup_var object_group;
+  PortableGroup::ObjectGroup_var object_group;
 
   /// Unbounded set containing replica references and all related
   /// information for each replica.
@@ -52,7 +52,7 @@ public:
 
   /// Properties used when creating this object group, in addition
   /// those set dynamically after the creation.
-  LoadBalancing::Properties properties;
+  PortableGroup::Properties properties;
 
   /// Lock used to synchronize access to the ReplicaInfo set.
   TAO_SYNCH_MUTEX lock;
@@ -124,10 +124,10 @@ private:
   /// Obtain the ObjectGroup hash map entry corresponding to the given
   /// ObjectGroup reference.
   TAO_LB_ObjectGroup_Map_Entry *get_group_entry (
-      LoadBalancing::ObjectGroup_ptr object_group,
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.cpp
index 5bdf9d4daf1..95a91256355 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.cpp
@@ -19,11 +19,11 @@ TAO_LB_PropertyManager::TAO_LB_PropertyManager (
 
 void
 TAO_LB_PropertyManager::set_default_properties (
-    const LoadBalancing::Properties & props,
+    const PortableGroup::Properties & props,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->validate_properties (props, ACE_TRY_ENV);
   ACE_CHECK;
@@ -35,16 +35,16 @@ TAO_LB_PropertyManager::set_default_properties (
   }
 }
 
-LoadBalancing::Properties *
+PortableGroup::Properties *
 TAO_LB_PropertyManager::get_default_properties (
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
-  LoadBalancing::Properties *props = 0;
+  PortableGroup::Properties *props = 0;
   ACE_NEW_THROW_EX (props,
-                    LoadBalancing::Properties (this->default_properties_),
+                    PortableGroup::Properties (this->default_properties_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
                         TAO_DEFAULT_MINOR_CODE,
@@ -57,11 +57,11 @@ TAO_LB_PropertyManager::get_default_properties (
 
 void
 TAO_LB_PropertyManager::remove_default_properties (
-    const LoadBalancing::Properties &props,
+    const PortableGroup::Properties &props,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->validate_properties (props, ACE_TRY_ENV);
   ACE_CHECK;
@@ -72,11 +72,11 @@ TAO_LB_PropertyManager::remove_default_properties (
 void
 TAO_LB_PropertyManager::set_type_properties (
     const char * /* type_id */,
-    const LoadBalancing::Properties & overrides,
+    const PortableGroup::Properties & overrides,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->validate_properties (overrides, ACE_TRY_ENV);
   ACE_CHECK;
@@ -84,7 +84,7 @@ TAO_LB_PropertyManager::set_type_properties (
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-LoadBalancing::Properties *
+PortableGroup::Properties *
 TAO_LB_PropertyManager::get_type_properties (
     const char * /* type_id */,
     CORBA::Environment &ACE_TRY_ENV)
@@ -96,11 +96,11 @@ TAO_LB_PropertyManager::get_type_properties (
 void
 TAO_LB_PropertyManager::remove_type_properties (
     const char * /* type_id */,
-    const LoadBalancing::Properties & props,
+    const PortableGroup::Properties & props,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->validate_properties (props, ACE_TRY_ENV);
   ACE_CHECK;
@@ -110,13 +110,13 @@ TAO_LB_PropertyManager::remove_type_properties (
 
 void
 TAO_LB_PropertyManager::set_properties_dynamically (
-    LoadBalancing::ObjectGroup_ptr /*object_group */,
-    const LoadBalancing::Properties & overrides,
+    PortableGroup::ObjectGroup_ptr /*object_group */,
+    const PortableGroup::Properties & overrides,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->validate_properties (overrides, ACE_TRY_ENV);
   ACE_CHECK;
@@ -124,12 +124,12 @@ TAO_LB_PropertyManager::set_properties_dynamically (
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-LoadBalancing::Properties *
+PortableGroup::Properties *
 TAO_LB_PropertyManager::get_properties (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
+    PortableGroup::ObjectGroup_ptr /* object_group */,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
 #if 0
   TAO_LB_ObjectGroup_Map_Entry *entry =
@@ -141,7 +141,7 @@ TAO_LB_PropertyManager::get_properties (
   //  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, property_map_guard, this->lock_, 0);
 
   // Merge the type-properties into the list.
-  LoadBalancing::Properties &type_properties;
+  PortableGroup::Properties &type_properties;
   if (this->type_properties_.find (entry.in (), type_properties == 0))
     {
     }
@@ -156,10 +156,10 @@ TAO_LB_PropertyManager::get_properties (
 
 void
 TAO_LB_PropertyManager::validate_properties (
-    const LoadBalancing::Properties & props,
+    const PortableGroup::Properties & props,
     CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+  ACE_THROW_SPEC ((PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   // @todo FIXME!  Just a hack to get things going...
 
@@ -170,21 +170,21 @@ TAO_LB_PropertyManager::validate_properties (
                           "Factories") == 0)
         return;
       else if (ACE_OS::strcmp (props[i].nam[0].id,
-                          "InitialNumberReplicas") == 0)
+                          "InitialNumberMembers") == 0)
         return;
       else if (ACE_OS::strcmp (props[i].nam[0].id,
-                          "MinimumNumberReplicas") == 0)
+                          "MinimumNumberMembers") == 0)
         return;
       else
-        ACE_THROW (LoadBalancing::UnsupportedProperty (props[i].nam));
+        ACE_THROW (PortableGroup::UnsupportedProperty (props[i].nam));
     }
 }
 
 // void
 // TAO_LB_PropertyManager::process_criteria (
 //   const char *type_id,
-//   const LoadBalancing::Criteria &the_criteria,  // IN
-//   LoadBalancing::Properties &props,             // OUT
+//   const PortableGroup::Criteria &the_criteria,  // IN
+//   PortableGroup::Properties &props,             // OUT
 //   CORBA::Environment &ACE_TRY_ENV)
 // {
 //   this->validate_properties (the_criteria, ACE_TRY_ENV);
@@ -198,10 +198,10 @@ TAO_LB_PropertyManager::validate_properties (
 //     }
 // }
 
-LoadBalancing::InitialNumberReplicas
-TAO_LB_PropertyManager::initial_number_replicas (
+PortableGroup::InitialNumberMembersValue
+TAO_LB_PropertyManager::initial_number_members (
   const char * /* type_id */,
-  const LoadBalancing::Criteria &the_criteria,
+  const PortableGroup::Criteria &the_criteria,
   CORBA::Environment &ACE_TRY_ENV) const
 {
   // @@ Hack to get things going.
@@ -212,14 +212,14 @@ TAO_LB_PropertyManager::initial_number_replicas (
   for (CORBA::ULong i = 0; i < len; ++i)
     {
       if (ACE_OS::strcmp (the_criteria[i].nam[0].id,
-                          "InitialNumberReplicas") == 0)
+                          "InitialNumberMembers") == 0)
         {
-          LoadBalancing::InitialNumberReplicas initial_number_replicas = 0;
+          PortableGroup::InitialNumberMembersValue initial_number_members = 0;
 
-          if (the_criteria[i].val >>= initial_number_replicas)
-            return initial_number_replicas;
+          if (the_criteria[i].val >>= initial_number_members)
+            return initial_number_members;
           else
-            ACE_THROW_RETURN (LoadBalancing::InvalidProperty (
+            ACE_THROW_RETURN (PortableGroup::InvalidProperty (
                                 the_criteria[i].nam,
                                 the_criteria[i].val),
                               0);
@@ -234,10 +234,10 @@ TAO_LB_PropertyManager::initial_number_replicas (
   return 0;  // @@ FIXME
 }
 
-LoadBalancing::FactoryInfos *
+PortableGroup::FactoryInfos *
 TAO_LB_PropertyManager::factory_infos (
   const char * /* type_id */,
-  const LoadBalancing::Criteria &the_criteria,
+  const PortableGroup::Criteria &the_criteria,
   CORBA::Environment &ACE_TRY_ENV) const
 {
   // @@ Hack to get things going.
@@ -250,16 +250,16 @@ TAO_LB_PropertyManager::factory_infos (
       if (ACE_OS::strcmp (the_criteria[i].nam[0].id,
                           "Factories") == 0)
         {
-          LoadBalancing::FactoryInfos *tmp = 0;
+          PortableGroup::FactoryInfos *tmp = 0;
 
           if (the_criteria[i].val >>= tmp)
             {
               // The Any retains ownership of the data, so we need to
               // return a copy.
-              LoadBalancing::FactoryInfos *factory_infos = 0;
+              PortableGroup::FactoryInfos *factory_infos = 0;
               ACE_NEW_THROW_EX (
                 factory_infos,
-                LoadBalancing::FactoryInfos (*tmp),
+                PortableGroup::FactoryInfos (*tmp),
                 CORBA::NO_MEMORY (
                   CORBA::SystemException::_tao_minor_code (
                     TAO_DEFAULT_MINOR_CODE,
@@ -270,7 +270,7 @@ TAO_LB_PropertyManager::factory_infos (
               return factory_infos;
             }
           else
-            ACE_THROW_RETURN (LoadBalancing::InvalidProperty (
+            ACE_THROW_RETURN (PortableGroup::InvalidProperty (
                                 the_criteria[i].nam,
                                 the_criteria[i].val),
                               0);
@@ -289,19 +289,19 @@ TAO_LB_PropertyManager::factory_infos (
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 // Type-specific property hash map template instantiations
-template class ACE_Hash_Map_Entry<const char *, LoadBalancing::Properties>;
-template class ACE_Hash_Map_Manager_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Entry<const char *, PortableGroup::Properties>;
+template class ACE_Hash_Map_Manager_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 // Type-specific property hash map template instantiations
-#pragma instantiate ACE_Hash_Map_Entry<const char *, LoadBalancing::Properties>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, LoadBalancing::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Entry<const char *, PortableGroup::Properties>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, PortableGroup::Properties, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.h
index 06260ad4a49..4ed24c6b7d9 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.h
@@ -24,6 +24,7 @@
 
 #include "ace/Functor.h"
 #include "ace/Hash_Map_Manager_T.h"
+#include "orbsvcs/PortableGroupC.h"
 #include "orbsvcs/LoadBalancingC.h"
 
 
@@ -34,7 +35,7 @@ class TAO_LB_ObjectGroup_Map;
 /**
  * @class TAO_LB_PropertyManager
  *
- * @brief Class that implements the LoadBalancing::PropertyManager
+ * @brief Class that implements the PortableGroup::PropertyManager
  *        interface.
  *
  * Only the default and type-specific properties are housed in this
@@ -44,7 +45,7 @@ class TAO_LB_ObjectGroup_Map;
  * PropertyManager is still used to manage those properties.
  */
 class TAO_LB_PropertyManager
-  : public virtual LoadBalancing::PropertyManager
+  : public virtual PortableGroup::PropertyManager
 {
 public:
 
@@ -52,47 +53,47 @@ public:
   TAO_LB_PropertyManager (TAO_LB_ObjectGroup_Map &object_group_map);
 
   /**
-   * @name TAO_LoadBalancer::PropertyManager methods
+   * @name PortableGroup::PropertyManager methods
    */
   //@{
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const LoadBalancing::Properties & props,
+      const PortableGroup::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /// Get the default properties used by all object groups.
-  virtual LoadBalancing::Properties * get_default_properties (
+  virtual PortableGroup::Properties * get_default_properties (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const LoadBalancing::Properties & props,
+      const PortableGroup::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /// Set properties associated with a given Replica type.  These
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const LoadBalancing::Properties & overrides,
+      const PortableGroup::Properties & overrides,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * Return the properties associated with a give Replica type.  These
    * properties include the type-specific properties in use, in
    * addition to the default properties that were not overridden.
    */
-  virtual LoadBalancing::Properties * get_type_properties (
+  virtual PortableGroup::Properties * get_type_properties (
       const char * type_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -100,11 +101,11 @@ public:
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const LoadBalancing::Properties & props,
+      const PortableGroup::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * Dynamically set the properties associated with a given object
@@ -113,13 +114,13 @@ public:
    * properties.
    */
   virtual void set_properties_dynamically (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Properties & overrides,
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Properties & overrides,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * Return the properties currently in use by the given object
@@ -128,21 +129,21 @@ public:
    * were used when the replica was created, and default properties
    * that weren't overridden.
    */
-  virtual LoadBalancing::Properties * get_properties (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::Properties * get_properties (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   //@}
 
 
   /// Verify that the given properties are valid and/or supported by
   /// the Load Balancer.
-  void validate_properties (const LoadBalancing::Properties &props,
+  void validate_properties (const PortableGroup::Properties &props,
                             CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+    ACE_THROW_SPEC ((PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * @name TAO-specific Load Balancing PropertyManager Helper Methods
@@ -155,7 +156,7 @@ public:
   //@{
 
   /// Return the membership style for the given object group.
-  LoadBalancing::MembershipStyle membership_style (
+  PortableGroup::MembershipStyleValue membership_style (
     CORBA::Object_ptr object_group) const;
 
   /// Return the load monitoring style for the given object group.
@@ -169,21 +170,21 @@ public:
 
   /// Return the initial number of replicas for the given object
   /// group.
-  LoadBalancing::InitialNumberReplicas
-    initial_number_replicas (const char *type_id,
-                             const LoadBalancing::Criteria &the_criteria,
-                             CORBA::Environment &ACE_TRY_ENV) const;
+  PortableGroup::InitialNumberMembersValue
+    initial_number_members (const char *type_id,
+                            const PortableGroup::Criteria &the_criteria,
+                            CORBA::Environment &ACE_TRY_ENV) const;
 
   /// Return the minimum number of replicas for the given object
   /// group.
-  LoadBalancing::MinimumNumberReplicas
-    minimum_number_replicas (CORBA::Object_ptr object_group) const;
+  PortableGroup::MinimumNumberMembersValue
+    minimum_number_members (CORBA::Object_ptr object_group) const;
 
   /// Return the sequence FactoryInfos associated with the given
   /// object group.
-  LoadBalancing::FactoryInfos *
+  PortableGroup::FactoryInfos *
     factory_infos (const char *type_id,
-                   const LoadBalancing::Criteria &the_criteria,
+                   const PortableGroup::Criteria &the_criteria,
                    CORBA::Environment &ACE_TRY_ENV) const;
 
   //@}
@@ -191,7 +192,7 @@ public:
   /// Type-specific property hash map.
   typedef ACE_Hash_Map_Manager_Ex<
     const char *,
-    LoadBalancing::Properties,
+    PortableGroup::Properties,
     ACE_Hash<const char *>,
     ACE_Equal_To<const char *>,
     ACE_Null_Mutex> Type_Prop_Table;
@@ -202,7 +203,7 @@ private:
   TAO_LB_ObjectGroup_Map &object_group_map_;
 
   /// Default properties.
-  LoadBalancing::Properties default_properties_;
+  PortableGroup::Properties default_properties_;
 
   /// Table of type-specific object group properties.
   Type_Prop_Table type_properties_;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
index 3e1c589bbfb..1b12a086660 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
@@ -25,22 +25,22 @@ TAO_LB_Pull_Handler::handle_timeout (
   TAO_LB_Location_Map::iterator end =
     this->location_map_.end ();
 
-  if (being == end)
+  if (begin == end)
     return 0;       // No work to be done.
 
-  // Iterate over all registered load monitors.
-  //
-  // @todo This could be potentially very slow.  Improve concurrent
-  //       operation at some point in the near future.
-  for (TAO_LB_Location_Map::iterator i = begin;
-       i != end;
-       ++i)
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
     {
-      TAO_LB_Location_Map_Entry *location = (*i).int_id_;
-      if (!CORBA::is_nil (location->load_monitor.in ()))
+      // Iterate over all registered load monitors.
+      //
+      // @todo This could be potentially very slow.  Improve concurrent
+      //       operation at some point in the near future.
+      for (TAO_LB_Location_Map::iterator i = begin;
+           i != end;
+           ++i)
         {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
+          TAO_LB_Location_Map_Entry *location = (*i).int_id_;
+          if (!CORBA::is_nil (location->load_monitor.in ()))
             {
               location->load_list =
                 location->load_monitor->current_load (ACE_TRY_ENV);
@@ -51,21 +51,9 @@ TAO_LB_Pull_Handler::handle_timeout (
 //                           (*i).ext_id_[0].id.in (),
 //                           location->load_list[0].value));
             }
-          ACE_CATCHANY
-            {
-              // Catch the exception and ignore it.
-
-              if (TAO_debug_level > 0)
-                ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                     "(%P|%t) Load monitoring exception");
-            }
-          ACE_ENDTRY;
         }
-    }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
+
       this->balancing_strategy_->analyze_loads (this->location_map_,
                                                 ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -73,10 +61,10 @@ TAO_LB_Pull_Handler::handle_timeout (
   ACE_CATCHANY
     {
       // Catch the exception and ignore it.
-
+      
       if (TAO_debug_level > 0)
         ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "(%P|%t) Load analysis exception");
+                             "(%P|%t) PullHandler::handle_timeout()\n");
     }
   ACE_ENDTRY;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RPMS_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RPMS_Monitor.cpp
index e17901eff88..76e2bc00290 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RPMS_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RPMS_Monitor.cpp
@@ -37,7 +37,7 @@ TAO_LB_RPMS_Monitor::init (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK;
 }
 
-LoadBalancing::LoadList *
+PortableGroup::LoadList *
 TAO_LB_RPMS_Monitor::current_load (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -49,9 +49,9 @@ TAO_LB_RPMS_Monitor::current_load (CORBA::Environment &ACE_TRY_ENV)
   // This optimization won't make a difference on single-threaded
   // server replicas.
 
-  LoadBalancing::LoadList *tmp_loads = 0;
+  PortableGroup::LoadList *tmp_loads = 0;
   ACE_NEW_THROW_EX (tmp_loads,
-                    LoadBalancing::LoadList,
+                    PortableGroup::LoadList,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
                         TAO_DEFAULT_MINOR_CODE,
@@ -59,7 +59,7 @@ TAO_LB_RPMS_Monitor::current_load (CORBA::Environment &ACE_TRY_ENV)
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
-  LoadBalancing::LoadList_var loads = tmp_loads;
+  PortableGroup::LoadList_var loads = tmp_loads;
 
   loads->length (1);
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RPMS_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RPMS_Monitor.h
index abea8ec744b..a5fd7ce021e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RPMS_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RPMS_Monitor.h
@@ -48,7 +48,7 @@ public:
   TAO_LB_RPMS_Monitor (void);
 
   /**
-   * @name LoadBalancing::LoadMonitor Methods
+   * @name PortableGroup::LoadMonitor Methods
    */
   //@{
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h
index 7a63f3a5d22..69cc02813bd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h
@@ -46,12 +46,12 @@ struct TAO_LB_ReplicaInfo
   CORBA::Object_var replica;
 
   /// FactoryInfo used when creating the replica.
-  LoadBalancing::FactoryInfo factory_info;
+  PortableGroup::FactoryInfo factory_info;
 
   /// FactoryCreationId assigned to this replica.  This
   /// FactoryCreationId_var will contain a zero pointer if the replica
   /// was not created using a GenericFactory.
-  LoadBalancing::GenericFactory::FactoryCreationId_var factory_creation_id;
+  PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id;
 
   /// Pointer to the object group map entry corresponding to the
   /// object group to which this replica member in this structure
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Equal_To.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Equal_To.h
index 0192ebf7dc7..32b22866e6c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Equal_To.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Equal_To.h
@@ -64,8 +64,8 @@ class TAO_LB_Location_Equal_To
 
 public:
 
-  int operator() (const TAO_LoadBalancing::Location &lhs,
-                  const TAO_LoadBalancing::Location &rhs) const;
+  int operator() (const TAO_PortableGroup::Location &lhs,
+                  const TAO_PortableGroup::Location &rhs) const;
   // Iterate through the contents of each Location until a mismatch
   // occurs.  If no mismatch is found, then the Locations are
   // considered equal.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Equal_To.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Equal_To.inl
index 29db9835b3c..6081cd73a84 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Equal_To.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Equal_To.inl
@@ -19,8 +19,8 @@ TAO_LB_Replica_Equal_To::operator() (
 
 ACE_INLINE int
 TAO_LB_Location_Equal_To::operator() (
-  const TAO_LoadBalancing::Location &lhs,
-  const TAO_LoadBalancing::Location &rhs) const
+  const TAO_PortableGroup::Location &lhs,
+  const TAO_PortableGroup::Location &rhs) const
 {
   size_t lhs_length = lhs.length ();
   size_t rhs_length = rhs.length ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Hash.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Hash.h
index e220dadf48a..3b6f5d037da 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Hash.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Hash.h
@@ -57,7 +57,7 @@ class TAO_LB_Location_Hash
 
 public:
 
-  CORBA::ULong operator() (const TAO_LoadBalancing::Location &) const;
+  CORBA::ULong operator() (const TAO_PortableGroup::Location &) const;
   // Generates a hash value based on the contents of the
   // Location.
 };
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Hash.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Hash.inl
index 450a9797e48..f3d6d1f0ca4 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Hash.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Replica_Hash.inl
@@ -12,7 +12,7 @@ TAO_LB_Replica_Hash::operator() (
 
 ACE_INLINE CORBA::ULong
 TAO_LB_Location_Hash::operator() (
-  const TAO_LoadBalancing::Location &location) const
+  const TAO_PortableGroup::Location &location) const
 {
   CORBA::ULong hash = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp
index b4a9eef3568..15b340a18a5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp
@@ -66,7 +66,7 @@ TAO_LoadBalancing_ReplicationManager_i::get_load_notifier (
 void
 TAO_LoadBalancing_ReplicationManager_i::register_load_monitor (
     LoadBalancing::LoadMonitor_ptr load_monitor,
-    const LoadBalancing::Location &the_location,
+    const PortableGroup::Location &the_location,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    LoadBalancing::MonitorAlreadyPresent))
@@ -130,7 +130,7 @@ TAO_LoadBalancing_ReplicationManager_i::register_load_monitor (
 
 LoadBalancing::LoadMonitor_ptr
 TAO_LoadBalancing_ReplicationManager_i::get_load_monitor (
-    const LoadBalancing::Location &the_location,
+    const PortableGroup::Location &the_location,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    LoadBalancing::LocationNotFound))
@@ -151,7 +151,7 @@ TAO_LoadBalancing_ReplicationManager_i::get_load_monitor (
 
 void
 TAO_LoadBalancing_ReplicationManager_i::remove_load_monitor (
-    const LoadBalancing::Location &the_location,
+    const PortableGroup::Location &the_location,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    LoadBalancing::LocationNotFound))
@@ -175,17 +175,17 @@ TAO_LoadBalancing_ReplicationManager_i::remove_load_monitor (
 
 void
 TAO_LoadBalancing_ReplicationManager_i::set_default_properties (
-    const LoadBalancing::Properties &props,
+    const PortableGroup::Properties &props,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.set_default_properties (props,
                                                   ACE_TRY_ENV);
 }
 
-LoadBalancing::Properties *
+PortableGroup::Properties *
 TAO_LoadBalancing_ReplicationManager_i::get_default_properties (
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -196,11 +196,11 @@ TAO_LoadBalancing_ReplicationManager_i::get_default_properties (
 
 void
 TAO_LoadBalancing_ReplicationManager_i::remove_default_properties (
-    const LoadBalancing::Properties &props,
+    const PortableGroup::Properties &props,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.remove_default_properties (props,
                                                      ACE_TRY_ENV);
@@ -209,18 +209,18 @@ TAO_LoadBalancing_ReplicationManager_i::remove_default_properties (
 void
 TAO_LoadBalancing_ReplicationManager_i::set_type_properties (
     const char *type_id,
-    const LoadBalancing::Properties &overrides,
+    const PortableGroup::Properties &overrides,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.set_type_properties (type_id,
                                                overrides,
                                                ACE_TRY_ENV);
 }
 
-LoadBalancing::Properties *
+PortableGroup::Properties *
 TAO_LoadBalancing_ReplicationManager_i::get_type_properties (
     const char *type_id,
     CORBA::Environment &ACE_TRY_ENV)
@@ -234,11 +234,11 @@ TAO_LoadBalancing_ReplicationManager_i::get_type_properties (
 void
 TAO_LoadBalancing_ReplicationManager_i::remove_type_properties (
     const char *type_id,
-    const LoadBalancing::Properties &props,
+    const PortableGroup::Properties &props,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.remove_type_properties (type_id,
                                                   props,
@@ -247,45 +247,45 @@ TAO_LoadBalancing_ReplicationManager_i::remove_type_properties (
 
 void
 TAO_LoadBalancing_ReplicationManager_i::set_properties_dynamically (
-    LoadBalancing::ObjectGroup_ptr object_group,
-    const LoadBalancing::Properties &overrides,
+    PortableGroup::ObjectGroup_ptr object_group,
+    const PortableGroup::Properties &overrides,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.set_properties_dynamically (object_group,
                                                       overrides,
                                                       ACE_TRY_ENV);
 }
 
-LoadBalancing::Properties *
+PortableGroup::Properties *
 TAO_LoadBalancing_ReplicationManager_i::get_properties (
-    LoadBalancing::ObjectGroup_ptr object_group,
+    PortableGroup::ObjectGroup_ptr object_group,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->property_manager_.get_properties (object_group,
                                             ACE_TRY_ENV);
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LoadBalancing_ReplicationManager_i::create_member (
-    LoadBalancing::ObjectGroup_ptr object_group,
-    const LoadBalancing::Location &the_location,
+    PortableGroup::ObjectGroup_ptr object_group,
+    const PortableGroup::Location &the_location,
     const char *type_id,
-    const LoadBalancing::Criteria &the_criteria,
+    const PortableGroup::Criteria &the_criteria,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberAlreadyPresent,
-                   LoadBalancing::NoFactory,
-                   LoadBalancing::ObjectNotCreated,
-                   LoadBalancing::InvalidCriteria,
-                   LoadBalancing::CannotMeetCriteria))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberAlreadyPresent,
+                   PortableGroup::NoFactory,
+                   PortableGroup::ObjectNotCreated,
+                   PortableGroup::InvalidCriteria,
+                   PortableGroup::CannotMeetCriteria))
 {
   return
     this->object_group_manager_.create_member (object_group,
@@ -295,16 +295,16 @@ TAO_LoadBalancing_ReplicationManager_i::create_member (
                                                ACE_TRY_ENV);
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LoadBalancing_ReplicationManager_i::add_member (
-    LoadBalancing::ObjectGroup_ptr object_group,
-    const LoadBalancing::Location &the_location,
+    PortableGroup::ObjectGroup_ptr object_group,
+    const PortableGroup::Location &the_location,
     CORBA::Object_ptr member,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberAlreadyPresent,
-                   LoadBalancing::ObjectNotAdded))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberAlreadyPresent,
+                   PortableGroup::ObjectNotAdded))
 {
   return
     this->object_group_manager_.add_member (object_group,
@@ -313,14 +313,14 @@ TAO_LoadBalancing_ReplicationManager_i::add_member (
                                             ACE_TRY_ENV);
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LoadBalancing_ReplicationManager_i::remove_member (
-    LoadBalancing::ObjectGroup_ptr object_group,
-    const LoadBalancing::Location &the_location,
+    PortableGroup::ObjectGroup_ptr object_group,
+    const PortableGroup::Location &the_location,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberNotFound))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberNotFound))
 {
   return
     this->object_group_manager_.remove_member (object_group,
@@ -328,36 +328,36 @@ TAO_LoadBalancing_ReplicationManager_i::remove_member (
                                                ACE_TRY_ENV);
 }
 
-LoadBalancing::Locations *
+PortableGroup::Locations *
 TAO_LoadBalancing_ReplicationManager_i::locations_of_members (
-    LoadBalancing::ObjectGroup_ptr object_group,
+    PortableGroup::ObjectGroup_ptr object_group,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->object_group_manager_.locations_of_members (object_group,
                                                       ACE_TRY_ENV);
 }
 
-LoadBalancing::ObjectGroupId
+PortableGroup::ObjectGroupId
 TAO_LoadBalancing_ReplicationManager_i::get_object_group_id (
-    LoadBalancing::ObjectGroup_ptr object_group,
+    PortableGroup::ObjectGroup_ptr object_group,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->object_group_manager_.get_object_group_id (object_group,
                                                      ACE_TRY_ENV);
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LoadBalancing_ReplicationManager_i::get_object_group_ref (
-    LoadBalancing::ObjectGroup_ptr object_group,
+    PortableGroup::ObjectGroup_ptr object_group,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->object_group_manager_.get_object_group_ref (object_group,
@@ -366,12 +366,12 @@ TAO_LoadBalancing_ReplicationManager_i::get_object_group_ref (
 
 CORBA::Object_ptr
 TAO_LoadBalancing_ReplicationManager_i::get_member_ref (
-    LoadBalancing::ObjectGroup_ptr object_group,
-    const LoadBalancing::Location &the_location,
+    PortableGroup::ObjectGroup_ptr object_group,
+    const PortableGroup::Location &the_location,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberNotFound))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberNotFound))
 {
   return
     this->object_group_manager_.get_member_ref (object_group,
@@ -382,16 +382,16 @@ TAO_LoadBalancing_ReplicationManager_i::get_member_ref (
 CORBA::Object_ptr
 TAO_LoadBalancing_ReplicationManager_i::create_object (
     const char * type_id,
-    const LoadBalancing::Criteria & the_criteria,
-    LoadBalancing::GenericFactory::FactoryCreationId_out
+    const PortableGroup::Criteria & the_criteria,
+    PortableGroup::GenericFactory::FactoryCreationId_out
       factory_creation_id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::NoFactory,
-                   LoadBalancing::ObjectNotCreated,
-                   LoadBalancing::InvalidCriteria,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::CannotMeetCriteria))
+                   PortableGroup::NoFactory,
+                   PortableGroup::ObjectNotCreated,
+                   PortableGroup::InvalidCriteria,
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::CannotMeetCriteria))
 {
   CORBA::Object_ptr obj =
     this->generic_factory_.create_object (type_id,
@@ -407,13 +407,13 @@ TAO_LoadBalancing_ReplicationManager_i::create_object (
 #if 0
 void
 TAO_LoadBalancing_ReplicationManager_i::process_criteria (
-  const LoadBalancing::Criteria & the_criteria,
+  const PortableGroup::Criteria & the_criteria,
   CORBA::Environment &ACE_TRY_ENV)
 {
   // List of invalid criteria.  If this list has a length greater than
-  // zero, then the LoadBalancing::InvalidCriteria exception will
+  // zero, then the PortableGroup::InvalidCriteria exception will
   // be thrown.
-  LoadBalancing::Criteria invalid_criteria;
+  PortableGroup::Criteria invalid_criteria;
 
   int found_factory = 0; // If factory was found in the_criteria, then
                          // set to 1.
@@ -423,7 +423,7 @@ TAO_LoadBalancing_ReplicationManager_i::process_criteria (
   for (CORBA::ULong i = 0; i < criteria_size; ++i)
     {
       CORBA::UShort initial_number_replicas = 0;
-      LoadBalancing::FactoryInfos factory_infos;
+      PortableGroup::FactoryInfos factory_infos;
 
       // Obtain the InitialNumberReplicas from the_criteria.
       if (this->get_initial_number_replicas (type_id,
@@ -444,25 +444,25 @@ TAO_LoadBalancing_ReplicationManager_i::process_criteria (
 
       // Unknown property
       else
-        ACE_THROW (LoadBalancing::InvalidProperty (the_criteria[i].nam,
+        ACE_THROW (PortableGroup::InvalidProperty (the_criteria[i].nam,
                                                    the_criteria[i].val));
     }
 
   if (invalid_criteria.length () != 0)
-    ACE_THROW (LoadBalancing::InvalidCriteria (invalid_criteria));
+    ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria));
 
   if (found_factory == 0)
-    ACE_THROW (LoadBalancing::NoFactory ());
+    ACE_THROW (PortableGroup::NoFactory ());
 }
 #endif  /* 0 */
 
 void
 TAO_LoadBalancing_ReplicationManager_i::delete_object (
-    const LoadBalancing::GenericFactory::FactoryCreationId &
+    const PortableGroup::GenericFactory::FactoryCreationId &
       factory_creation_id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectNotFound))
+                   PortableGroup::ObjectNotFound))
 {
   this->generic_factory_.delete_object (factory_creation_id,
                                         ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.h
index ade067ae4e8..d80ca9ae2aa 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/LoadBalancingS.h"
+#include "orbsvcs/PortableGroupC.h"
 
 #include "LB_Location_Map.h"
 #include "LB_ObjectGroup_Map.h"
@@ -63,14 +64,14 @@ public:
   /// Register a load monitor with the load balancer.
   virtual void register_load_monitor (
       LoadBalancing::LoadMonitor_ptr load_monitor,
-      const LoadBalancing::Location & the_location,
+      const PortableGroup::Location & the_location,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      LoadBalancing::MonitorAlreadyPresent));
 
   /// Return a reference to the load monitor at the given location.
   virtual LoadBalancing::LoadMonitor_ptr get_load_monitor (
-      const LoadBalancing::Location & the_location,
+      const PortableGroup::Location & the_location,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      LoadBalancing::LocationNotFound));
@@ -78,53 +79,53 @@ public:
   /// Remove a load monitor at the given location from the load
   /// balancer.
   virtual void remove_load_monitor (
-      const LoadBalancing::Location & the_location,
+      const PortableGroup::Location & the_location,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      LoadBalancing::LocationNotFound));
 
   /**
-   * @name LoadBalancing::PropertyManager methods
+   * @name PortableGroup::PropertyManager methods
    */
   //@{
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const LoadBalancing::Properties & props,
+      const PortableGroup::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /// Get the default properties used by all object groups.
-  virtual LoadBalancing::Properties * get_default_properties (
+  virtual PortableGroup::Properties * get_default_properties (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const LoadBalancing::Properties & props,
+      const PortableGroup::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /// Set properties associated with a given Replica type.  These
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const LoadBalancing::Properties & overrides,
+      const PortableGroup::Properties & overrides,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * Return the properties associated with a give Replica type.  These
    * properties include the type-specific properties in use, in
    * addition to the default properties that were not overridden.
    */
-  virtual LoadBalancing::Properties * get_type_properties (
+  virtual PortableGroup::Properties * get_type_properties (
       const char * type_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -132,11 +133,11 @@ public:
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const LoadBalancing::Properties & props,
+      const PortableGroup::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * Dynamically set the properties associated with a given object
@@ -145,13 +146,13 @@ public:
    * properties.
    */
   virtual void set_properties_dynamically (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Properties & overrides,
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Properties & overrides,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * Return the properties currently in use by the given object
@@ -160,45 +161,45 @@ public:
    * were used when the Replica was created, and default properties
    * that weren't overridden.
    */
-  virtual LoadBalancing::Properties * get_properties (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::Properties * get_properties (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   //@}
 
   /**
-   * @name LoadBalancing::ObjectGroupManager methods
+   * @name PortableGroup::ObjectGroupManager methods
    */
   //@{
 
   /// Create a member using the load balancer ObjectGroupManager, and
   /// add the created object to the ObjectGroup.
-  virtual LoadBalancing::ObjectGroup_ptr create_member (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  virtual PortableGroup::ObjectGroup_ptr create_member (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       const char * type_id,
-      const LoadBalancing::Criteria & the_criteria,
+      const PortableGroup::Criteria & the_criteria,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberAlreadyPresent,
-                     LoadBalancing::NoFactory,
-                     LoadBalancing::ObjectNotCreated,
-                     LoadBalancing::InvalidCriteria,
-                     LoadBalancing::CannotMeetCriteria));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberAlreadyPresent,
+                     PortableGroup::NoFactory,
+                     PortableGroup::ObjectNotCreated,
+                     PortableGroup::InvalidCriteria,
+                     PortableGroup::CannotMeetCriteria));
 
   /// Add an existing object to the ObjectGroup.
-  virtual LoadBalancing::ObjectGroup_ptr add_member (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  virtual PortableGroup::ObjectGroup_ptr add_member (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       CORBA::Object_ptr member,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberAlreadyPresent,
-                     LoadBalancing::ObjectNotAdded));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberAlreadyPresent,
+                     PortableGroup::ObjectNotAdded));
 
   /**
    * Remove an object at a specific location from the given
@@ -207,49 +208,49 @@ public:
    * infrastructure (load balancer) will be deleted by the
    * infrastructure.
    */
-  virtual LoadBalancing::ObjectGroup_ptr remove_member (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  virtual PortableGroup::ObjectGroup_ptr remove_member (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberNotFound));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
-  virtual LoadBalancing::Locations * locations_of_members (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::Locations * locations_of_members (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   /// Return the ObjectGroupId for the given ObjectGroup.
-  virtual LoadBalancing::ObjectGroupId get_object_group_id (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::ObjectGroupId get_object_group_id (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   /// @note Does this method make sense for load balanced objects?
-  virtual LoadBalancing::ObjectGroup_ptr get_object_group_ref (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   /// Return the reference corresponding to the Replica of a given
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & loc,
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & loc,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberNotFound));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberNotFound));
 
   //@}
 
   /**
-   * @name LoadBalancing::GenericFactory methods
+   * @name PortableGroup::GenericFactory methods
    */
   //@{
 
@@ -261,16 +262,16 @@ public:
    */
   virtual CORBA::Object_ptr create_object (
       const char * type_id,
-      const LoadBalancing::Criteria & the_criteria,
-      LoadBalancing::GenericFactory::FactoryCreationId_out
+      const PortableGroup::Criteria & the_criteria,
+      PortableGroup::GenericFactory::FactoryCreationId_out
         factory_creation_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::NoFactory,
-                     LoadBalancing::ObjectNotCreated,
-                     LoadBalancing::InvalidCriteria,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::CannotMeetCriteria));
+                     PortableGroup::NoFactory,
+                     PortableGroup::ObjectNotCreated,
+                     PortableGroup::InvalidCriteria,
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::CannotMeetCriteria));
 
   /**
    * Delete the object corresponding to the provided
@@ -279,11 +280,11 @@ public:
    * Afterward, the ObjectGroup itself will be deleted.
    */
   virtual void delete_object (
-      const LoadBalancing::GenericFactory::FactoryCreationId &
+      const PortableGroup::GenericFactory::FactoryCreationId &
         factory_creation_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectNotFound));
+                     PortableGroup::ObjectNotFound));
 
   //@}
 
@@ -312,7 +313,7 @@ private:
   /// the_criteria.
   int get_initial_number_replicas (
     const char *type_id,
-    const LoadBalancing::Criteria &the_criteria,
+    const PortableGroup::Criteria &the_criteria,
     CORBA::UShort &initial_number_replicas) const;
 
   /// Extract the value of the Factories property from the_criteria.
@@ -324,8 +325,8 @@ private:
    */
   int get_factory_infos (
     const char *type_id,
-    const LoadBalancing::Criteria &the_criteria,
-    LoadBalancing::FactoryInfos &factory_infos) const;
+    const PortableGroup::Criteria &the_criteria,
+    PortableGroup::FactoryInfos &factory_infos) const;
 
 private:
 
@@ -338,7 +339,7 @@ private:
   /// Mutex that provides synchronization.
   TAO_SYNCH_MUTEX lock_;
 
-  /// Table that maps LoadBalancing::Location to load monitor at that
+  /// Table that maps PortableGroup::Location to load monitor at that
   /// location, in addition to the replicas residing at that
   /// location.
   TAO_LB_Location_Map location_map_;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp
index 8dc15cbde74..caac990bd15 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp
@@ -40,7 +40,7 @@ TAO_LB_ReplicaProxy::current_load (CORBA::Float load,
 
 void
 TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
+  ACE_THROW_SPEC ((PortableGroup::ReplicaProxy::NotConnected,
                    CORBA::SystemException))
 {
   ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -56,17 +56,17 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV)
     }
   else
     {
-      ACE_THROW (LoadBalancing::ReplicaProxy::NotConnected ());
+      ACE_THROW (PortableGroup::ReplicaProxy::NotConnected ());
     }
 }
 
 void
 TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer,
-                              LoadBalancing::ReplicaControl_ptr control,
+                              PortableGroup::ReplicaControl_ptr control,
                               CORBA::Object_ptr replica,
                               CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
-                   LoadBalancing::ReplicaProxy::NilReplica,
+  ACE_THROW_SPEC ((PortableGroup::ReplicaProxy::NilControl,
+                   PortableGroup::ReplicaProxy::NilReplica,
                    CORBA::SystemException))
 {
   ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -83,14 +83,14 @@ TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer,
     this->balancer_ = balancer;
 
   if (!CORBA::is_nil (control))
-    this->control_ = LoadBalancing::ReplicaControl::_duplicate (control);
+    this->control_ = PortableGroup::ReplicaControl::_duplicate (control);
   else
-    ACE_THROW (LoadBalancing::ReplicaProxy::NilControl ());
+    ACE_THROW (PortableGroup::ReplicaProxy::NilControl ());
 
   if (!CORBA::is_nil (control))
       this->replica_ = CORBA::Object::_duplicate (replica);
   else
-    ACE_THROW (LoadBalancing::ReplicaProxy::NilReplica ());
+    ACE_THROW (PortableGroup::ReplicaProxy::NilReplica ());
 
   // Now indicate that connection to LoadBalancer has been made.
   this->connected_ = 1;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h
index a4f60a41a06..3f8f7fe6667 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h
@@ -39,7 +39,7 @@ class TAO_LB_LoadBalancer;
 // Forward declaration
 
 class TAO_LoadBalancing_Export TAO_LB_ReplicaProxy :
-  public virtual POA_LoadBalancing::ReplicaProxy,
+  public virtual POA_PortableGroup::ReplicaProxy,
   public virtual PortableServer::RefCountServantBase
 {
   friend class TAO_LB_LoadBalancer;
@@ -70,7 +70,7 @@ public:
   // react proactively to those...
 
   virtual void disconnect (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
+    ACE_THROW_SPEC ((PortableGroup::ReplicaProxy::NotConnected,
                      CORBA::SystemException));
   // Send a request to disconnect from the LoadBalancer.
 
@@ -81,7 +81,7 @@ public:
   // @@ Ossama: i added this flag to avoid multiple nomimal load
   // advisories and high load advisories to be sent.
 
-  LoadBalancing::ReplicaControl_var control_;
+  PortableGroup::ReplicaControl_var control_;
   // Reference to the ReplicaControl.
 
 private:
@@ -91,11 +91,11 @@ private:
   // the heap.
 
   void connect (TAO_LB_LoadBalancer *balancer,
-                LoadBalancing::ReplicaControl_ptr control,
+                PortableGroup::ReplicaControl_ptr control,
                 CORBA::Object_ptr replica,
                 CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
-                     LoadBalancing::ReplicaProxy::NilReplica,
+    ACE_THROW_SPEC ((PortableGroup::ReplicaProxy::NilControl,
+                     PortableGroup::ReplicaProxy::NilReplica,
                      CORBA::SystemException));
   // Register the ReplicaControl and the Object being load balanced
   // with the ReplicaProxy.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp
index b4a9eef3568..15b340a18a5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp
@@ -66,7 +66,7 @@ TAO_LoadBalancing_ReplicationManager_i::get_load_notifier (
 void
 TAO_LoadBalancing_ReplicationManager_i::register_load_monitor (
     LoadBalancing::LoadMonitor_ptr load_monitor,
-    const LoadBalancing::Location &the_location,
+    const PortableGroup::Location &the_location,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    LoadBalancing::MonitorAlreadyPresent))
@@ -130,7 +130,7 @@ TAO_LoadBalancing_ReplicationManager_i::register_load_monitor (
 
 LoadBalancing::LoadMonitor_ptr
 TAO_LoadBalancing_ReplicationManager_i::get_load_monitor (
-    const LoadBalancing::Location &the_location,
+    const PortableGroup::Location &the_location,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    LoadBalancing::LocationNotFound))
@@ -151,7 +151,7 @@ TAO_LoadBalancing_ReplicationManager_i::get_load_monitor (
 
 void
 TAO_LoadBalancing_ReplicationManager_i::remove_load_monitor (
-    const LoadBalancing::Location &the_location,
+    const PortableGroup::Location &the_location,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    LoadBalancing::LocationNotFound))
@@ -175,17 +175,17 @@ TAO_LoadBalancing_ReplicationManager_i::remove_load_monitor (
 
 void
 TAO_LoadBalancing_ReplicationManager_i::set_default_properties (
-    const LoadBalancing::Properties &props,
+    const PortableGroup::Properties &props,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.set_default_properties (props,
                                                   ACE_TRY_ENV);
 }
 
-LoadBalancing::Properties *
+PortableGroup::Properties *
 TAO_LoadBalancing_ReplicationManager_i::get_default_properties (
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -196,11 +196,11 @@ TAO_LoadBalancing_ReplicationManager_i::get_default_properties (
 
 void
 TAO_LoadBalancing_ReplicationManager_i::remove_default_properties (
-    const LoadBalancing::Properties &props,
+    const PortableGroup::Properties &props,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.remove_default_properties (props,
                                                      ACE_TRY_ENV);
@@ -209,18 +209,18 @@ TAO_LoadBalancing_ReplicationManager_i::remove_default_properties (
 void
 TAO_LoadBalancing_ReplicationManager_i::set_type_properties (
     const char *type_id,
-    const LoadBalancing::Properties &overrides,
+    const PortableGroup::Properties &overrides,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.set_type_properties (type_id,
                                                overrides,
                                                ACE_TRY_ENV);
 }
 
-LoadBalancing::Properties *
+PortableGroup::Properties *
 TAO_LoadBalancing_ReplicationManager_i::get_type_properties (
     const char *type_id,
     CORBA::Environment &ACE_TRY_ENV)
@@ -234,11 +234,11 @@ TAO_LoadBalancing_ReplicationManager_i::get_type_properties (
 void
 TAO_LoadBalancing_ReplicationManager_i::remove_type_properties (
     const char *type_id,
-    const LoadBalancing::Properties &props,
+    const PortableGroup::Properties &props,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.remove_type_properties (type_id,
                                                   props,
@@ -247,45 +247,45 @@ TAO_LoadBalancing_ReplicationManager_i::remove_type_properties (
 
 void
 TAO_LoadBalancing_ReplicationManager_i::set_properties_dynamically (
-    LoadBalancing::ObjectGroup_ptr object_group,
-    const LoadBalancing::Properties &overrides,
+    PortableGroup::ObjectGroup_ptr object_group,
+    const PortableGroup::Properties &overrides,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::UnsupportedProperty))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.set_properties_dynamically (object_group,
                                                       overrides,
                                                       ACE_TRY_ENV);
 }
 
-LoadBalancing::Properties *
+PortableGroup::Properties *
 TAO_LoadBalancing_ReplicationManager_i::get_properties (
-    LoadBalancing::ObjectGroup_ptr object_group,
+    PortableGroup::ObjectGroup_ptr object_group,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->property_manager_.get_properties (object_group,
                                             ACE_TRY_ENV);
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LoadBalancing_ReplicationManager_i::create_member (
-    LoadBalancing::ObjectGroup_ptr object_group,
-    const LoadBalancing::Location &the_location,
+    PortableGroup::ObjectGroup_ptr object_group,
+    const PortableGroup::Location &the_location,
     const char *type_id,
-    const LoadBalancing::Criteria &the_criteria,
+    const PortableGroup::Criteria &the_criteria,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberAlreadyPresent,
-                   LoadBalancing::NoFactory,
-                   LoadBalancing::ObjectNotCreated,
-                   LoadBalancing::InvalidCriteria,
-                   LoadBalancing::CannotMeetCriteria))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberAlreadyPresent,
+                   PortableGroup::NoFactory,
+                   PortableGroup::ObjectNotCreated,
+                   PortableGroup::InvalidCriteria,
+                   PortableGroup::CannotMeetCriteria))
 {
   return
     this->object_group_manager_.create_member (object_group,
@@ -295,16 +295,16 @@ TAO_LoadBalancing_ReplicationManager_i::create_member (
                                                ACE_TRY_ENV);
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LoadBalancing_ReplicationManager_i::add_member (
-    LoadBalancing::ObjectGroup_ptr object_group,
-    const LoadBalancing::Location &the_location,
+    PortableGroup::ObjectGroup_ptr object_group,
+    const PortableGroup::Location &the_location,
     CORBA::Object_ptr member,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberAlreadyPresent,
-                   LoadBalancing::ObjectNotAdded))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberAlreadyPresent,
+                   PortableGroup::ObjectNotAdded))
 {
   return
     this->object_group_manager_.add_member (object_group,
@@ -313,14 +313,14 @@ TAO_LoadBalancing_ReplicationManager_i::add_member (
                                             ACE_TRY_ENV);
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LoadBalancing_ReplicationManager_i::remove_member (
-    LoadBalancing::ObjectGroup_ptr object_group,
-    const LoadBalancing::Location &the_location,
+    PortableGroup::ObjectGroup_ptr object_group,
+    const PortableGroup::Location &the_location,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberNotFound))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberNotFound))
 {
   return
     this->object_group_manager_.remove_member (object_group,
@@ -328,36 +328,36 @@ TAO_LoadBalancing_ReplicationManager_i::remove_member (
                                                ACE_TRY_ENV);
 }
 
-LoadBalancing::Locations *
+PortableGroup::Locations *
 TAO_LoadBalancing_ReplicationManager_i::locations_of_members (
-    LoadBalancing::ObjectGroup_ptr object_group,
+    PortableGroup::ObjectGroup_ptr object_group,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->object_group_manager_.locations_of_members (object_group,
                                                       ACE_TRY_ENV);
 }
 
-LoadBalancing::ObjectGroupId
+PortableGroup::ObjectGroupId
 TAO_LoadBalancing_ReplicationManager_i::get_object_group_id (
-    LoadBalancing::ObjectGroup_ptr object_group,
+    PortableGroup::ObjectGroup_ptr object_group,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->object_group_manager_.get_object_group_id (object_group,
                                                      ACE_TRY_ENV);
 }
 
-LoadBalancing::ObjectGroup_ptr
+PortableGroup::ObjectGroup_ptr
 TAO_LoadBalancing_ReplicationManager_i::get_object_group_ref (
-    LoadBalancing::ObjectGroup_ptr object_group,
+    PortableGroup::ObjectGroup_ptr object_group,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound))
+                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->object_group_manager_.get_object_group_ref (object_group,
@@ -366,12 +366,12 @@ TAO_LoadBalancing_ReplicationManager_i::get_object_group_ref (
 
 CORBA::Object_ptr
 TAO_LoadBalancing_ReplicationManager_i::get_member_ref (
-    LoadBalancing::ObjectGroup_ptr object_group,
-    const LoadBalancing::Location &the_location,
+    PortableGroup::ObjectGroup_ptr object_group,
+    const PortableGroup::Location &the_location,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberNotFound))
+                   PortableGroup::ObjectGroupNotFound,
+                   PortableGroup::MemberNotFound))
 {
   return
     this->object_group_manager_.get_member_ref (object_group,
@@ -382,16 +382,16 @@ TAO_LoadBalancing_ReplicationManager_i::get_member_ref (
 CORBA::Object_ptr
 TAO_LoadBalancing_ReplicationManager_i::create_object (
     const char * type_id,
-    const LoadBalancing::Criteria & the_criteria,
-    LoadBalancing::GenericFactory::FactoryCreationId_out
+    const PortableGroup::Criteria & the_criteria,
+    PortableGroup::GenericFactory::FactoryCreationId_out
       factory_creation_id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::NoFactory,
-                   LoadBalancing::ObjectNotCreated,
-                   LoadBalancing::InvalidCriteria,
-                   LoadBalancing::InvalidProperty,
-                   LoadBalancing::CannotMeetCriteria))
+                   PortableGroup::NoFactory,
+                   PortableGroup::ObjectNotCreated,
+                   PortableGroup::InvalidCriteria,
+                   PortableGroup::InvalidProperty,
+                   PortableGroup::CannotMeetCriteria))
 {
   CORBA::Object_ptr obj =
     this->generic_factory_.create_object (type_id,
@@ -407,13 +407,13 @@ TAO_LoadBalancing_ReplicationManager_i::create_object (
 #if 0
 void
 TAO_LoadBalancing_ReplicationManager_i::process_criteria (
-  const LoadBalancing::Criteria & the_criteria,
+  const PortableGroup::Criteria & the_criteria,
   CORBA::Environment &ACE_TRY_ENV)
 {
   // List of invalid criteria.  If this list has a length greater than
-  // zero, then the LoadBalancing::InvalidCriteria exception will
+  // zero, then the PortableGroup::InvalidCriteria exception will
   // be thrown.
-  LoadBalancing::Criteria invalid_criteria;
+  PortableGroup::Criteria invalid_criteria;
 
   int found_factory = 0; // If factory was found in the_criteria, then
                          // set to 1.
@@ -423,7 +423,7 @@ TAO_LoadBalancing_ReplicationManager_i::process_criteria (
   for (CORBA::ULong i = 0; i < criteria_size; ++i)
     {
       CORBA::UShort initial_number_replicas = 0;
-      LoadBalancing::FactoryInfos factory_infos;
+      PortableGroup::FactoryInfos factory_infos;
 
       // Obtain the InitialNumberReplicas from the_criteria.
       if (this->get_initial_number_replicas (type_id,
@@ -444,25 +444,25 @@ TAO_LoadBalancing_ReplicationManager_i::process_criteria (
 
       // Unknown property
       else
-        ACE_THROW (LoadBalancing::InvalidProperty (the_criteria[i].nam,
+        ACE_THROW (PortableGroup::InvalidProperty (the_criteria[i].nam,
                                                    the_criteria[i].val));
     }
 
   if (invalid_criteria.length () != 0)
-    ACE_THROW (LoadBalancing::InvalidCriteria (invalid_criteria));
+    ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria));
 
   if (found_factory == 0)
-    ACE_THROW (LoadBalancing::NoFactory ());
+    ACE_THROW (PortableGroup::NoFactory ());
 }
 #endif  /* 0 */
 
 void
 TAO_LoadBalancing_ReplicationManager_i::delete_object (
-    const LoadBalancing::GenericFactory::FactoryCreationId &
+    const PortableGroup::GenericFactory::FactoryCreationId &
       factory_creation_id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectNotFound))
+                   PortableGroup::ObjectNotFound))
 {
   this->generic_factory_.delete_object (factory_creation_id,
                                         ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancingI.h b/TAO/orbsvcs/orbsvcs/LoadBalancingI.h
index ade067ae4e8..d80ca9ae2aa 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancingI.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancingI.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/LoadBalancingS.h"
+#include "orbsvcs/PortableGroupC.h"
 
 #include "LB_Location_Map.h"
 #include "LB_ObjectGroup_Map.h"
@@ -63,14 +64,14 @@ public:
   /// Register a load monitor with the load balancer.
   virtual void register_load_monitor (
       LoadBalancing::LoadMonitor_ptr load_monitor,
-      const LoadBalancing::Location & the_location,
+      const PortableGroup::Location & the_location,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      LoadBalancing::MonitorAlreadyPresent));
 
   /// Return a reference to the load monitor at the given location.
   virtual LoadBalancing::LoadMonitor_ptr get_load_monitor (
-      const LoadBalancing::Location & the_location,
+      const PortableGroup::Location & the_location,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      LoadBalancing::LocationNotFound));
@@ -78,53 +79,53 @@ public:
   /// Remove a load monitor at the given location from the load
   /// balancer.
   virtual void remove_load_monitor (
-      const LoadBalancing::Location & the_location,
+      const PortableGroup::Location & the_location,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      LoadBalancing::LocationNotFound));
 
   /**
-   * @name LoadBalancing::PropertyManager methods
+   * @name PortableGroup::PropertyManager methods
    */
   //@{
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const LoadBalancing::Properties & props,
+      const PortableGroup::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /// Get the default properties used by all object groups.
-  virtual LoadBalancing::Properties * get_default_properties (
+  virtual PortableGroup::Properties * get_default_properties (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const LoadBalancing::Properties & props,
+      const PortableGroup::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /// Set properties associated with a given Replica type.  These
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const LoadBalancing::Properties & overrides,
+      const PortableGroup::Properties & overrides,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * Return the properties associated with a give Replica type.  These
    * properties include the type-specific properties in use, in
    * addition to the default properties that were not overridden.
    */
-  virtual LoadBalancing::Properties * get_type_properties (
+  virtual PortableGroup::Properties * get_type_properties (
       const char * type_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -132,11 +133,11 @@ public:
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const LoadBalancing::Properties & props,
+      const PortableGroup::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * Dynamically set the properties associated with a given object
@@ -145,13 +146,13 @@ public:
    * properties.
    */
   virtual void set_properties_dynamically (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Properties & overrides,
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Properties & overrides,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::UnsupportedProperty));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::UnsupportedProperty));
 
   /**
    * Return the properties currently in use by the given object
@@ -160,45 +161,45 @@ public:
    * were used when the Replica was created, and default properties
    * that weren't overridden.
    */
-  virtual LoadBalancing::Properties * get_properties (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::Properties * get_properties (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   //@}
 
   /**
-   * @name LoadBalancing::ObjectGroupManager methods
+   * @name PortableGroup::ObjectGroupManager methods
    */
   //@{
 
   /// Create a member using the load balancer ObjectGroupManager, and
   /// add the created object to the ObjectGroup.
-  virtual LoadBalancing::ObjectGroup_ptr create_member (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  virtual PortableGroup::ObjectGroup_ptr create_member (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       const char * type_id,
-      const LoadBalancing::Criteria & the_criteria,
+      const PortableGroup::Criteria & the_criteria,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberAlreadyPresent,
-                     LoadBalancing::NoFactory,
-                     LoadBalancing::ObjectNotCreated,
-                     LoadBalancing::InvalidCriteria,
-                     LoadBalancing::CannotMeetCriteria));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberAlreadyPresent,
+                     PortableGroup::NoFactory,
+                     PortableGroup::ObjectNotCreated,
+                     PortableGroup::InvalidCriteria,
+                     PortableGroup::CannotMeetCriteria));
 
   /// Add an existing object to the ObjectGroup.
-  virtual LoadBalancing::ObjectGroup_ptr add_member (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  virtual PortableGroup::ObjectGroup_ptr add_member (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       CORBA::Object_ptr member,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberAlreadyPresent,
-                     LoadBalancing::ObjectNotAdded));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberAlreadyPresent,
+                     PortableGroup::ObjectNotAdded));
 
   /**
    * Remove an object at a specific location from the given
@@ -207,49 +208,49 @@ public:
    * infrastructure (load balancer) will be deleted by the
    * infrastructure.
    */
-  virtual LoadBalancing::ObjectGroup_ptr remove_member (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & the_location,
+  virtual PortableGroup::ObjectGroup_ptr remove_member (
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & the_location,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberNotFound));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
-  virtual LoadBalancing::Locations * locations_of_members (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::Locations * locations_of_members (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   /// Return the ObjectGroupId for the given ObjectGroup.
-  virtual LoadBalancing::ObjectGroupId get_object_group_id (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::ObjectGroupId get_object_group_id (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   /// @note Does this method make sense for load balanced objects?
-  virtual LoadBalancing::ObjectGroup_ptr get_object_group_ref (
-      LoadBalancing::ObjectGroup_ptr object_group,
+  virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
+      PortableGroup::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound));
+                     PortableGroup::ObjectGroupNotFound));
 
   /// Return the reference corresponding to the Replica of a given
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
-      LoadBalancing::ObjectGroup_ptr object_group,
-      const LoadBalancing::Location & loc,
+      PortableGroup::ObjectGroup_ptr object_group,
+      const PortableGroup::Location & loc,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectGroupNotFound,
-                     LoadBalancing::MemberNotFound));
+                     PortableGroup::ObjectGroupNotFound,
+                     PortableGroup::MemberNotFound));
 
   //@}
 
   /**
-   * @name LoadBalancing::GenericFactory methods
+   * @name PortableGroup::GenericFactory methods
    */
   //@{
 
@@ -261,16 +262,16 @@ public:
    */
   virtual CORBA::Object_ptr create_object (
       const char * type_id,
-      const LoadBalancing::Criteria & the_criteria,
-      LoadBalancing::GenericFactory::FactoryCreationId_out
+      const PortableGroup::Criteria & the_criteria,
+      PortableGroup::GenericFactory::FactoryCreationId_out
         factory_creation_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::NoFactory,
-                     LoadBalancing::ObjectNotCreated,
-                     LoadBalancing::InvalidCriteria,
-                     LoadBalancing::InvalidProperty,
-                     LoadBalancing::CannotMeetCriteria));
+                     PortableGroup::NoFactory,
+                     PortableGroup::ObjectNotCreated,
+                     PortableGroup::InvalidCriteria,
+                     PortableGroup::InvalidProperty,
+                     PortableGroup::CannotMeetCriteria));
 
   /**
    * Delete the object corresponding to the provided
@@ -279,11 +280,11 @@ public:
    * Afterward, the ObjectGroup itself will be deleted.
    */
   virtual void delete_object (
-      const LoadBalancing::GenericFactory::FactoryCreationId &
+      const PortableGroup::GenericFactory::FactoryCreationId &
         factory_creation_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     LoadBalancing::ObjectNotFound));
+                     PortableGroup::ObjectNotFound));
 
   //@}
 
@@ -312,7 +313,7 @@ private:
   /// the_criteria.
   int get_initial_number_replicas (
     const char *type_id,
-    const LoadBalancing::Criteria &the_criteria,
+    const PortableGroup::Criteria &the_criteria,
     CORBA::UShort &initial_number_replicas) const;
 
   /// Extract the value of the Factories property from the_criteria.
@@ -324,8 +325,8 @@ private:
    */
   int get_factory_infos (
     const char *type_id,
-    const LoadBalancing::Criteria &the_criteria,
-    LoadBalancing::FactoryInfos &factory_infos) const;
+    const PortableGroup::Criteria &the_criteria,
+    PortableGroup::FactoryInfos &factory_infos) const;
 
 private:
 
@@ -338,7 +339,7 @@ private:
   /// Mutex that provides synchronization.
   TAO_SYNCH_MUTEX lock_;
 
-  /// Table that maps LoadBalancing::Location to load monitor at that
+  /// Table that maps PortableGroup::Location to load monitor at that
   /// location, in addition to the replicas residing at that
   /// location.
   TAO_LB_Location_Map location_map_;
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing b/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing
index 38f9c6f3502..0936e3f1abc 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing
+++ b/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing
@@ -94,8 +94,7 @@ realclean: clean
 .obj/LB_Balancing_Strategy.o .obj/LB_Balancing_Strategy.so .shobj/LB_Balancing_Strategy.o .shobj/LB_Balancing_Strategy.so: LoadBalancing/LB_Balancing_Strategy.cpp \
  LoadBalancing/LB_Balancing_Strategy.h \
  $(ACE_ROOT)/ace/pre.h \
- LoadBalancingS.h \
- $(TAO_ROOT)/tao/PortableInterceptorS.h \
+ LoadBalancing/LoadBalancing_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -104,7 +103,11 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ LoadBalancingS.h \
+ PortableGroupS.h \
+ CosNamingS.h \
+ CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -192,7 +195,12 @@ realclean: clean
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -204,13 +212,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -218,13 +229,38 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
  $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -242,45 +278,10 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
- CosNamingS.h \
- CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
@@ -310,6 +311,25 @@ realclean: clean
  CosNamingS_T.i \
  CosNamingS_T.cpp \
  CosNamingS.i \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/GIOPS.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/GIOPS_T.h \
+ $(TAO_ROOT)/tao/GIOPS_T.i \
+ $(TAO_ROOT)/tao/GIOPS_T.cpp \
+ $(TAO_ROOT)/tao/GIOPS.i \
+ PortableGroupC.h \
+ portable_group_export.h \
+ PortableGroupC.i \
+ PortableGroupS_T.h \
+ PortableGroupS_T.i \
+ PortableGroupS_T.cpp \
+ PortableGroupS.i \
  LoadBalancingC.h \
  LoadBalancing/LoadBalancing_export.h \
  LoadBalancingC.i \
@@ -317,7 +337,38 @@ realclean: clean
  LoadBalancingS_T.i \
  LoadBalancingS_T.cpp \
  LoadBalancingS.i \
- LoadBalancing/LoadBalancing_export.h
+ LoadBalancing/LB_Location_Map.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_Location_Hash.h \
+ LoadBalancing/LB_Location_Hash.inl \
+ LoadBalancing/LB_Location_Equal_To.h \
+ LoadBalancing/LB_Location_Equal_To.inl
 
 .obj/LB_GenericFactory.o .obj/LB_GenericFactory.so .shobj/LB_GenericFactory.o .shobj/LB_GenericFactory.so: LoadBalancing/LB_GenericFactory.cpp \
  LoadBalancing/LB_GenericFactory.h \
@@ -451,7 +502,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- LoadBalancingC.h \
+ PortableGroupC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(ACE_ROOT)/ace/Unbounded_Queue.h \
@@ -517,11 +568,13 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- LoadBalancing/LoadBalancing_export.h \
+ portable_group_export.h \
  CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
- LoadBalancingC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ PortableGroupC.i \
  LoadBalancing/LB_Location_Map.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -550,6 +603,9 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ LoadBalancingC.h \
+ LoadBalancing/LoadBalancing_export.h \
+ LoadBalancingC.i \
  LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_Location_Hash.h \
  LoadBalancing/LB_Location_Hash.inl \
  LoadBalancing/LB_Location_Equal_To.h \
@@ -776,9 +832,14 @@ realclean: clean
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  LoadBalancing/LoadBalancing_export.h \
+ PortableGroupC.h \
+ portable_group_export.h \
  CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ PortableGroupC.i \
  LoadBalancingC.i \
  LoadBalancing/LB_Location_Equal_To.inl
 
@@ -978,9 +1039,14 @@ realclean: clean
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  LoadBalancing/LoadBalancing_export.h \
+ PortableGroupC.h \
+ portable_group_export.h \
  CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ PortableGroupC.i \
  LoadBalancingC.i \
  LoadBalancing/LB_Location_Hash.inl
 
@@ -1207,9 +1273,14 @@ realclean: clean
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  LoadBalancing/LoadBalancing_export.h \
+ PortableGroupC.h \
+ portable_group_export.h \
  CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ PortableGroupC.i \
  LoadBalancingC.i \
  LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_Location_Hash.h \
  LoadBalancing/LB_Location_Hash.inl \
@@ -1220,8 +1291,7 @@ realclean: clean
  LoadBalancing/LB_Minimum_Dispersion.h \
  $(ACE_ROOT)/ace/pre.h \
  LoadBalancing/LB_Balancing_Strategy.h \
- LoadBalancingS.h \
- $(TAO_ROOT)/tao/PortableInterceptorS.h \
+ LoadBalancing/LoadBalancing_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -1230,7 +1300,11 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ LoadBalancingS.h \
+ PortableGroupS.h \
+ CosNamingS.h \
+ CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1318,7 +1392,12 @@ realclean: clean
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -1330,13 +1409,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1344,13 +1426,38 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
  $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -1368,45 +1475,10 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
- CosNamingS.h \
- CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
@@ -1436,6 +1508,25 @@ realclean: clean
  CosNamingS_T.i \
  CosNamingS_T.cpp \
  CosNamingS.i \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/GIOPS.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/GIOPS_T.h \
+ $(TAO_ROOT)/tao/GIOPS_T.i \
+ $(TAO_ROOT)/tao/GIOPS_T.cpp \
+ $(TAO_ROOT)/tao/GIOPS.i \
+ PortableGroupC.h \
+ portable_group_export.h \
+ PortableGroupC.i \
+ PortableGroupS_T.h \
+ PortableGroupS_T.i \
+ PortableGroupS_T.cpp \
+ PortableGroupS.i \
  LoadBalancingC.h \
  LoadBalancing/LoadBalancing_export.h \
  LoadBalancingC.i \
@@ -1443,12 +1534,6 @@ realclean: clean
  LoadBalancingS_T.i \
  LoadBalancingS_T.cpp \
  LoadBalancingS.i \
- LoadBalancing/LoadBalancing_export.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
  LoadBalancing/LB_Location_Map.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -1481,6 +1566,11 @@ realclean: clean
  LoadBalancing/LB_Location_Hash.inl \
  LoadBalancing/LB_Location_Equal_To.h \
  LoadBalancing/LB_Location_Equal_To.inl \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
  LoadBalancing/LB_ObjectGroup_Map.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
@@ -1506,7 +1596,7 @@ realclean: clean
 .obj/LB_ObjectGroupManager.o .obj/LB_ObjectGroupManager.so .shobj/LB_ObjectGroupManager.o .shobj/LB_ObjectGroupManager.so: LoadBalancing/LB_ObjectGroupManager.cpp \
  LoadBalancing/LB_ObjectGroupManager.h \
  $(ACE_ROOT)/ace/pre.h \
- LoadBalancingC.h \
+ PortableGroupC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -1698,11 +1788,13 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- LoadBalancing/LoadBalancing_export.h \
+ portable_group_export.h \
  CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
- LoadBalancingC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ PortableGroupC.i \
  LoadBalancing/LB_Location_Map.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -1731,6 +1823,9 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ LoadBalancingC.h \
+ LoadBalancing/LoadBalancing_export.h \
+ LoadBalancingC.i \
  LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_Location_Hash.h \
  LoadBalancing/LB_Location_Hash.inl \
  LoadBalancing/LB_Location_Equal_To.h \
@@ -1983,9 +2078,14 @@ realclean: clean
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  LoadBalancing/LoadBalancing_export.h \
+ PortableGroupC.h \
+ portable_group_export.h \
  CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ PortableGroupC.i \
  LoadBalancingC.i \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -2127,7 +2227,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- LoadBalancingC.h \
+ PortableGroupC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -2233,10 +2333,15 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- LoadBalancing/LoadBalancing_export.h \
+ portable_group_export.h \
  CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ PortableGroupC.i \
+ LoadBalancingC.h \
+ LoadBalancing/LoadBalancing_export.h \
  LoadBalancingC.i \
  LoadBalancing/LB_ObjectGroup_Map.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
@@ -2459,9 +2564,14 @@ realclean: clean
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  LoadBalancing/LoadBalancing_export.h \
+ PortableGroupC.h \
+ portable_group_export.h \
  CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ PortableGroupC.i \
  LoadBalancingC.i \
  LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_Location_Map.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
@@ -2509,8 +2619,10 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  LoadBalancingS.h \
- $(TAO_ROOT)/tao/PortableInterceptorS.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ PortableGroupS.h \
+ CosNamingS.h \
+ CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -2598,7 +2710,12 @@ realclean: clean
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -2610,13 +2727,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -2624,13 +2744,38 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
  $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -2648,45 +2793,10 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
- CosNamingS.h \
- CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
@@ -2716,6 +2826,25 @@ realclean: clean
  CosNamingS_T.i \
  CosNamingS_T.cpp \
  CosNamingS.i \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/GIOPS.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/GIOPS_T.h \
+ $(TAO_ROOT)/tao/GIOPS_T.i \
+ $(TAO_ROOT)/tao/GIOPS_T.cpp \
+ $(TAO_ROOT)/tao/GIOPS.i \
+ PortableGroupC.h \
+ portable_group_export.h \
+ PortableGroupC.i \
+ PortableGroupS_T.h \
+ PortableGroupS_T.i \
+ PortableGroupS_T.cpp \
+ PortableGroupS.i \
  LoadBalancingC.h \
  LoadBalancing/LoadBalancing_export.h \
  LoadBalancingC.i \
@@ -2952,9 +3081,14 @@ realclean: clean
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  LoadBalancing/LoadBalancing_export.h \
+ PortableGroupC.h \
+ portable_group_export.h \
  CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ PortableGroupC.i \
  LoadBalancingC.i \
  LoadBalancing/LB_Redirect_Table.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
@@ -3536,9 +3670,14 @@ realclean: clean
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  LoadBalancing/LoadBalancing_export.h \
+ PortableGroupC.h \
+ portable_group_export.h \
  CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ PortableGroupC.i \
  LoadBalancingC.i
 
 .obj/LB_ReplicaLocator.o .obj/LB_ReplicaLocator.so .shobj/LB_ReplicaLocator.o .shobj/LB_ReplicaLocator.so: LoadBalancing/LB_ReplicaLocator.cpp \
@@ -3677,36 +3816,7 @@ realclean: clean
  $(TAO_ROOT)/tao/LocalObject.i \
  LoadBalancing/LoadBalancingI.h \
  LoadBalancingS.h \
- $(TAO_ROOT)/tao/PortableInterceptorS.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ PortableGroupS.h \
  CosNamingS.h \
  CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -3727,6 +3837,10 @@ realclean: clean
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -3735,6 +3849,31 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
@@ -3761,6 +3900,25 @@ realclean: clean
  CosNamingS_T.i \
  CosNamingS_T.cpp \
  CosNamingS.i \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/GIOPS.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/GIOPS_T.h \
+ $(TAO_ROOT)/tao/GIOPS_T.i \
+ $(TAO_ROOT)/tao/GIOPS_T.cpp \
+ $(TAO_ROOT)/tao/GIOPS.i \
+ PortableGroupC.h \
+ portable_group_export.h \
+ PortableGroupC.i \
+ PortableGroupS_T.h \
+ PortableGroupS_T.i \
+ PortableGroupS_T.cpp \
+ PortableGroupS.i \
  LoadBalancingC.h \
  LoadBalancing/LoadBalancing_export.h \
  LoadBalancingC.i \
@@ -3881,8 +4039,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  LoadBalancingS.h \
- $(TAO_ROOT)/tao/PortableInterceptorS.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ PortableGroupS.h \
+ CosNamingS.h \
+ CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -3925,7 +4085,12 @@ realclean: clean
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -3937,13 +4102,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -3951,13 +4119,38 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
  $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -3975,45 +4168,10 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
- CosNamingS.h \
- CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
@@ -4043,6 +4201,25 @@ realclean: clean
  CosNamingS_T.i \
  CosNamingS_T.cpp \
  CosNamingS.i \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/GIOPS.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/GIOPS_T.h \
+ $(TAO_ROOT)/tao/GIOPS_T.i \
+ $(TAO_ROOT)/tao/GIOPS_T.cpp \
+ $(TAO_ROOT)/tao/GIOPS.i \
+ PortableGroupC.h \
+ portable_group_export.h \
+ PortableGroupC.i \
+ PortableGroupS_T.h \
+ PortableGroupS_T.i \
+ PortableGroupS_T.cpp \
+ PortableGroupS.i \
  LoadBalancingC.h \
  LoadBalancing/LoadBalancing_export.h \
  LoadBalancingC.i \
@@ -4158,7 +4335,8 @@ realclean: clean
 
 .obj/LoadBalancingS.o .obj/LoadBalancingS.so .shobj/LoadBalancingS.o .shobj/LoadBalancingS.so: LoadBalancingS.cpp LoadBalancingS.h \
  $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/PortableInterceptorS.h \
+ PortableGroupS.h CosNamingS.h CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -4167,7 +4345,6 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -4255,7 +4432,12 @@ realclean: clean
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -4267,13 +4449,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -4281,13 +4466,38 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
  $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -4305,44 +4515,10 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
- CosNamingS.h CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(ACE_ROOT)/ace/Array_Base.h \
  $(ACE_ROOT)/ace/Array_Base.inl \
@@ -4368,9 +4544,24 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
  CosNamingS_T.h CosNamingS_T.i CosNamingS_T.cpp CosNamingS.i \
- LoadBalancingC.h LoadBalancing/LoadBalancing_export.h \
- LoadBalancingC.i LoadBalancingS_T.h LoadBalancingS_T.i \
- LoadBalancingS_T.cpp LoadBalancingS.i \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/GIOPS.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/GIOPS_T.h \
+ $(TAO_ROOT)/tao/GIOPS_T.i \
+ $(TAO_ROOT)/tao/GIOPS_T.cpp \
+ $(TAO_ROOT)/tao/GIOPS.i \
+ PortableGroupC.h portable_group_export.h PortableGroupC.i \
+ PortableGroupS_T.h PortableGroupS_T.i PortableGroupS_T.cpp \
+ PortableGroupS.i LoadBalancingC.h \
+ LoadBalancing/LoadBalancing_export.h LoadBalancingC.i \
+ LoadBalancingS_T.h LoadBalancingS_T.i LoadBalancingS_T.cpp \
+ LoadBalancingS.i \
  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
@@ -4430,8 +4621,6 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
  $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -4689,8 +4878,12 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- LoadBalancing/LoadBalancing_export.h CosNamingC.h \
- Naming/naming_export.h CosNamingC.i LoadBalancingC.i \
+ LoadBalancing/LoadBalancing_export.h PortableGroupC.h \
+ portable_group_export.h CosNamingC.h Naming/naming_export.h \
+ CosNamingC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ PortableGroupC.i LoadBalancingC.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/Pluggable.i \
diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp
index 8dc15cbde74..caac990bd15 100644
--- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp
@@ -40,7 +40,7 @@ TAO_LB_ReplicaProxy::current_load (CORBA::Float load,
 
 void
 TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
+  ACE_THROW_SPEC ((PortableGroup::ReplicaProxy::NotConnected,
                    CORBA::SystemException))
 {
   ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -56,17 +56,17 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV)
     }
   else
     {
-      ACE_THROW (LoadBalancing::ReplicaProxy::NotConnected ());
+      ACE_THROW (PortableGroup::ReplicaProxy::NotConnected ());
     }
 }
 
 void
 TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer,
-                              LoadBalancing::ReplicaControl_ptr control,
+                              PortableGroup::ReplicaControl_ptr control,
                               CORBA::Object_ptr replica,
                               CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
-                   LoadBalancing::ReplicaProxy::NilReplica,
+  ACE_THROW_SPEC ((PortableGroup::ReplicaProxy::NilControl,
+                   PortableGroup::ReplicaProxy::NilReplica,
                    CORBA::SystemException))
 {
   ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -83,14 +83,14 @@ TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer,
     this->balancer_ = balancer;
 
   if (!CORBA::is_nil (control))
-    this->control_ = LoadBalancing::ReplicaControl::_duplicate (control);
+    this->control_ = PortableGroup::ReplicaControl::_duplicate (control);
   else
-    ACE_THROW (LoadBalancing::ReplicaProxy::NilControl ());
+    ACE_THROW (PortableGroup::ReplicaProxy::NilControl ());
 
   if (!CORBA::is_nil (control))
       this->replica_ = CORBA::Object::_duplicate (replica);
   else
-    ACE_THROW (LoadBalancing::ReplicaProxy::NilReplica ());
+    ACE_THROW (PortableGroup::ReplicaProxy::NilReplica ());
 
   // Now indicate that connection to LoadBalancer has been made.
   this->connected_ = 1;
diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h
index a4f60a41a06..3f8f7fe6667 100644
--- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h
+++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h
@@ -39,7 +39,7 @@ class TAO_LB_LoadBalancer;
 // Forward declaration
 
 class TAO_LoadBalancing_Export TAO_LB_ReplicaProxy :
-  public virtual POA_LoadBalancing::ReplicaProxy,
+  public virtual POA_PortableGroup::ReplicaProxy,
   public virtual PortableServer::RefCountServantBase
 {
   friend class TAO_LB_LoadBalancer;
@@ -70,7 +70,7 @@ public:
   // react proactively to those...
 
   virtual void disconnect (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
+    ACE_THROW_SPEC ((PortableGroup::ReplicaProxy::NotConnected,
                      CORBA::SystemException));
   // Send a request to disconnect from the LoadBalancer.
 
@@ -81,7 +81,7 @@ public:
   // @@ Ossama: i added this flag to avoid multiple nomimal load
   // advisories and high load advisories to be sent.
 
-  LoadBalancing::ReplicaControl_var control_;
+  PortableGroup::ReplicaControl_var control_;
   // Reference to the ReplicaControl.
 
 private:
@@ -91,11 +91,11 @@ private:
   // the heap.
 
   void connect (TAO_LB_LoadBalancer *balancer,
-                LoadBalancing::ReplicaControl_ptr control,
+                PortableGroup::ReplicaControl_ptr control,
                 CORBA::Object_ptr replica,
                 CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
-                     LoadBalancing::ReplicaProxy::NilReplica,
+    ACE_THROW_SPEC ((PortableGroup::ReplicaProxy::NilControl,
+                     PortableGroup::ReplicaProxy::NilReplica,
                      CORBA::SystemException));
   // Register the ReplicaControl and the Object being load balanced
   // with the ReplicaProxy.