Wed Jan 9 19:09:43 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

        * tao/Dynamic_TP/DTP_Config.h:
        * tao/Dynamic_TP/DTP_Config.cpp:
        * tao/Dynamic_TP/DTP_ORBInitializer.h:
        * tao/Dynamic_TP/DTP_ORBInitializer.cpp:
        * tao/Dynamic_TP/DTP_ORB_Loader.h:
        * tao/Dynamic_TP/DTP_ORB_Loader.cpp:
        * tao/Dynamic_TP/DTP_POA_Loader.h:
        * tao/Dynamic_TP/DTP_POA_Loader.cpp:
        * tao/Dynamic_TP/DTP_POA_Strategy.h:
        * tao/Dynamic_TP/DTP_POA_Strategy.inl:
        * tao/Dynamic_TP/DTP_POA_Strategy.cpp:
        * tao/Dynamic_TP/DTP_Task.h:
        * tao/Dynamic_TP/DTP_Task.inl:
        * tao/Dynamic_TP/DTP_Task.cpp:
        * tao/Dynamic_TP/DTP_Thread_Pool.h:

          Added these files.

        * tests/Dynamic_TP/Config_Loader/Test.cpp:
        * tests/Dynamic_TP/Config_Loader/svc.conf:

        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl:
        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp:
        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc1.conf:
        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc2.conf:
        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc3.conf:
        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc4.conf:

        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl:
        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp:

        * tests/Dynamic_TP/POA_Loader/Test.cpp:
        * tests/Dynamic_TP/POA_Loader/svc.conf:

          Modified these files.

        * tao/Dynamic_TP/Dynamic_TP_Config.h:
        * tao/Dynamic_TP/Dynamic_TP_Config.cpp:
        * tao/Dynamic_TP/Dynamic_TP_ORBInitializer.h:
        * tao/Dynamic_TP/Dynamic_TP_ORBInitializer.cpp:
        * tao/Dynamic_TP/Dynamic_TP_ORB_Loader.h:
        * tao/Dynamic_TP/Dynamic_TP_ORB_Loader.cpp:
        * tao/Dynamic_TP/Dynamic_TP_POA_Loader.h:
        * tao/Dynamic_TP/Dynamic_TP_POA_Loader.cpp:
        * tao/Dynamic_TP/Dynamic_TP_POA_Strategy.h:
        * tao/Dynamic_TP/Dynamic_TP_POA_Strategy.inl:
        * tao/Dynamic_TP/Dynamic_TP_POA_Strategy.cpp:
        * tao/Dynamic_TP/Dynamic_TP_Task.h:
        * tao/Dynamic_TP/Dynamic_TP_Task.inl:
        * tao/Dynamic_TP/Dynamic_TP_Task.cpp:

          Removed these files.

          Unified the naming convension for the Dynamic_TP library. All class names and
          svc.conf objects are prefixed with DTP_ or TAO_DTP_ as appropriate.

28 files changed, 364 insertions, 293 deletions

diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index 0b97c9c9365..74b8861dda9 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,61 @@
+Wed Jan  9 19:09:43 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/Dynamic_TP/DTP_Config.h:
+        * tao/Dynamic_TP/DTP_Config.cpp:
+        * tao/Dynamic_TP/DTP_ORBInitializer.h:
+        * tao/Dynamic_TP/DTP_ORBInitializer.cpp:
+        * tao/Dynamic_TP/DTP_ORB_Loader.h:
+        * tao/Dynamic_TP/DTP_ORB_Loader.cpp:
+        * tao/Dynamic_TP/DTP_POA_Loader.h:
+        * tao/Dynamic_TP/DTP_POA_Loader.cpp:
+        * tao/Dynamic_TP/DTP_POA_Strategy.h:
+        * tao/Dynamic_TP/DTP_POA_Strategy.inl:
+        * tao/Dynamic_TP/DTP_POA_Strategy.cpp:
+        * tao/Dynamic_TP/DTP_Task.h:
+        * tao/Dynamic_TP/DTP_Task.inl:
+        * tao/Dynamic_TP/DTP_Task.cpp:
+        * tao/Dynamic_TP/DTP_Thread_Pool.h:
+
+          Added these files.
+
+        * tests/Dynamic_TP/Config_Loader/Test.cpp:
+        * tests/Dynamic_TP/Config_Loader/svc.conf:
+
+        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl:
+        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp:
+        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc1.conf:
+        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc2.conf:
+        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc3.conf:
+        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc4.conf:
+
+        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl:
+        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp:
+
+        * tests/Dynamic_TP/POA_Loader/Test.cpp:
+        * tests/Dynamic_TP/POA_Loader/svc.conf:
+
+          Modified these files.
+
+        * tao/Dynamic_TP/Dynamic_TP_Config.h:
+        * tao/Dynamic_TP/Dynamic_TP_Config.cpp:
+        * tao/Dynamic_TP/Dynamic_TP_ORBInitializer.h:
+        * tao/Dynamic_TP/Dynamic_TP_ORBInitializer.cpp:
+        * tao/Dynamic_TP/Dynamic_TP_ORB_Loader.h:
+        * tao/Dynamic_TP/Dynamic_TP_ORB_Loader.cpp:
+        * tao/Dynamic_TP/Dynamic_TP_POA_Loader.h:
+        * tao/Dynamic_TP/Dynamic_TP_POA_Loader.cpp:
+        * tao/Dynamic_TP/Dynamic_TP_POA_Strategy.h:
+        * tao/Dynamic_TP/Dynamic_TP_POA_Strategy.inl:
+        * tao/Dynamic_TP/Dynamic_TP_POA_Strategy.cpp:
+        * tao/Dynamic_TP/Dynamic_TP_Task.h:
+        * tao/Dynamic_TP/Dynamic_TP_Task.inl:
+        * tao/Dynamic_TP/Dynamic_TP_Task.cpp:
+
+          Removed these files.
+
+          Unified the naming convension for the Dynamic_TP library. All class names and
+          svc.conf objects are prefixed with DTP_ or TAO_DTP_ as appropriate.
+
 Wed Jan  9 16:46:56 UTC 2013  Byron Harris  <harrisb@ociweb.com>
 
         * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp:
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_Config.cpp b/TAO/tao/Dynamic_TP/DTP_Config.cpp
index feef01396c1..85e37764dc2 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_Config.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Config.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "tao/Dynamic_TP/Dynamic_TP_Config.h"
+#include "tao/Dynamic_TP/DTP_Config.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/Dynamic_TP/Dynamic_TP_ORBInitializer.h"
+#include "tao/Dynamic_TP/DTP_ORBInitializer.h"
 
 #include "tao/debug.h"
 #include "ace/Dynamic_Service.h"
@@ -12,56 +12,56 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Dynamic_TP_Config_Registry_Installer::TAO_Dynamic_TP_Config_Registry_Installer (void)
+TAO_DTP_Config_Registry_Installer::TAO_DTP_Config_Registry_Installer (void)
 {
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_Dynamic_TP_Config_Registry);
+  ACE_Service_Config::process_directive (ace_svc_desc_TAO_DTP_Config_Registry);
 }
 
 
-TAO_Dynamic_TP_Config_Registry::TAO_Dynamic_TP_Config_Registry (void)
+TAO_DTP_Config_Registry::TAO_DTP_Config_Registry (void)
 {
 }
 
-TAO_Dynamic_TP_Config_Registry::~TAO_Dynamic_TP_Config_Registry (void)
+TAO_DTP_Config_Registry::~TAO_DTP_Config_Registry (void)
 {
 }
 
 int
-TAO_Dynamic_TP_Config_Registry::init (int , ACE_TCHAR* [] )
+TAO_DTP_Config_Registry::init (int , ACE_TCHAR* [] )
 {
   return 0;
 }
 
 bool
-TAO_Dynamic_TP_Config_Registry::find (const ACE_CString& name, TAO_DTP_Definition &entry)
+TAO_DTP_Config_Registry::find (const ACE_CString& name, TAO_DTP_Definition &entry)
 {
   return registry_.find (name, entry) == 0;
 }
 
 int
-TAO_Dynamic_TP_Config_Registry::bind (const ACE_CString& name, TAO_DTP_Definition &entry)
+TAO_DTP_Config_Registry::bind (const ACE_CString& name, TAO_DTP_Definition &entry)
 {
   return registry_.bind (name, entry);
 }
 
 int
-TAO_Dynamic_TP_Config_Registry::rebind (const ACE_CString& name, TAO_DTP_Definition &entry)
+TAO_DTP_Config_Registry::rebind (const ACE_CString& name, TAO_DTP_Definition &entry)
 {
   return registry_.rebind (name, entry);
 }
 
 //--------------------------------------------------------------------------------------
 
-TAO_Dynamic_TP_Config::TAO_Dynamic_TP_Config (void)
+TAO_DTP_Config::TAO_DTP_Config (void)
 {
 }
 
-TAO_Dynamic_TP_Config::~TAO_Dynamic_TP_Config (void)
+TAO_DTP_Config::~TAO_DTP_Config (void)
 {
 }
 
 int
-TAO_Dynamic_TP_Config::init (int argc, ACE_TCHAR* argv[])
+TAO_DTP_Config::init (int argc, ACE_TCHAR* argv[])
 {
 //  TAO_DTP_Definition entry =  {-1,5,-1,0,60,0};
   TAO_DTP_Definition entry;
@@ -150,30 +150,43 @@ TAO_Dynamic_TP_Config::init (int argc, ACE_TCHAR* argv[])
           if (TAO_debug_level > 0)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Config - Unrecognized argv[%d], %C\n"),
+                          ACE_TEXT ("TAO (%P|%t) - DTP_Config - Unrecognized argv[%d], %C\n"),
                          curarg, argv[curarg]));
             }
           return -1;
         }
     }
 
+  if ((entry.max_threads_ != -1 && entry.max_threads_ < entry.init_threads_) ||
+      (entry.min_threads_ > entry.init_threads_))
+    {
+      if (TAO_debug_level > 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("TAO (%P|%t) - DTP_Config - thread count constraint ")
+                      ACE_TEXT ("violated, min: %d <= init: %d <= max: %d or max = -1\n"),
+                      entry.min_threads_, entry.init_threads_, entry.max_threads_));
+        }
+      return 0;
+    }
+
   ACE_CString name_str = name;
   ACE_Service_Gestalt *current = ACE_Service_Config::current();
-  TAO_Dynamic_TP_Config_Registry* registry =
-    ACE_Dynamic_Service<TAO_Dynamic_TP_Config_Registry>::instance
-    (current, "Dynamic_TP_Config_Registry", true);
+  TAO_DTP_Config_Registry* registry =
+    ACE_Dynamic_Service<TAO_DTP_Config_Registry>::instance
+    (current, "DTP_Config_Registry", true);
 
   if (registry == 0)
     {
-      current->process_directive (ace_svc_desc_TAO_Dynamic_TP_Config_Registry);
-      registry = ACE_Dynamic_Service<TAO_Dynamic_TP_Config_Registry>::instance
-        (current, "Dynamic_TP_Config_Registry", true);
+      current->process_directive (ace_svc_desc_TAO_DTP_Config_Registry);
+      registry = ACE_Dynamic_Service<TAO_DTP_Config_Registry>::instance
+        (current, "DTP_Config_Registry", true);
       if (registry == 0)
         {
           if (TAO_debug_level > 0)
             {
               ACE_DEBUG((LM_DEBUG,
-                         ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Config - cannot initialize registry\n")));
+                         ACE_TEXT ("TAO (%P|%t) - DTP_Config - cannot initialize registry\n")));
             }
           return -1;
         }
@@ -191,7 +204,7 @@ TAO_Dynamic_TP_Config::init (int argc, ACE_TCHAR* argv[])
 }
 
 int
-TAO_Dynamic_TP_Config::parse_long (int &curarg,
+TAO_DTP_Config::parse_long (int &curarg,
                                    int argc, ACE_TCHAR *argv[],
                                    const ACE_TCHAR *match, long &value)
 {
@@ -211,7 +224,7 @@ TAO_Dynamic_TP_Config::parse_long (int &curarg,
 }
 
 int
-TAO_Dynamic_TP_Config::parse_bool (int &curarg,
+TAO_DTP_Config::parse_bool (int &curarg,
                                    int argc, ACE_TCHAR *argv[],
                                    const ACE_TCHAR *match, bool &value)
 {
@@ -226,7 +239,7 @@ TAO_Dynamic_TP_Config::parse_bool (int &curarg,
 }
 
 int
-TAO_Dynamic_TP_Config::parse_string (int &curarg,
+TAO_DTP_Config::parse_string (int &curarg,
                                      int argc, ACE_TCHAR *argv[],
                                      const ACE_TCHAR *match, ACE_TCHAR *&value)
 {
@@ -246,13 +259,13 @@ TAO_Dynamic_TP_Config::parse_string (int &curarg,
 
 
 void
-TAO_Dynamic_TP_Config::report_option_value_error (const ACE_TCHAR* option_name,
+TAO_DTP_Config::report_option_value_error (const ACE_TCHAR* option_name,
                                                   const ACE_TCHAR* option_value)
 {
   if (TAO_debug_level > 0)
     {
       ACE_DEBUG((LM_DEBUG,
-                 ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Config - unknown ")
+                 ACE_TEXT ("TAO (%P|%t) - DTP_Config - unknown ")
                  ACE_TEXT ("argument <%s> for <%s>\n"),
                  option_value, option_name));
     }
@@ -261,19 +274,19 @@ TAO_Dynamic_TP_Config::report_option_value_error (const ACE_TCHAR* option_name,
 
 /////////////////////////////////////////////////////////////////////
 
-ACE_FACTORY_DEFINE (TAO_Dynamic_TP, TAO_Dynamic_TP_Config_Registry)
-ACE_STATIC_SVC_DEFINE (TAO_Dynamic_TP_Config_Registry,
-                       ACE_TEXT ("Dynamic_TP_Config_Registry"),
+ACE_FACTORY_DEFINE (TAO_Dynamic_TP, TAO_DTP_Config_Registry)
+ACE_STATIC_SVC_DEFINE (TAO_DTP_Config_Registry,
+                       ACE_TEXT ("DTP_Config_Registry"),
                        ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Dynamic_TP_Config_Registry),
+                       &ACE_SVC_NAME (TAO_DTP_Config_Registry),
                        ACE_Service_Type::DELETE_THIS
                        | ACE_Service_Type::DELETE_OBJ,
                        0)
-ACE_FACTORY_DEFINE (TAO_Dynamic_TP, TAO_Dynamic_TP_Config)
-ACE_STATIC_SVC_DEFINE (TAO_Dynamic_TP_Config,
-                       ACE_TEXT ("Dynamic_TP_Config"),
+ACE_FACTORY_DEFINE (TAO_Dynamic_TP, TAO_DTP_Config)
+ACE_STATIC_SVC_DEFINE (TAO_DTP_Config,
+                       ACE_TEXT ("DTP_Config"),
                        ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Dynamic_TP_Config),
+                       &ACE_SVC_NAME (TAO_DTP_Config),
                        ACE_Service_Type::DELETE_THIS
                        | ACE_Service_Type::DELETE_OBJ,
                        0)
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_Config.h b/TAO/tao/Dynamic_TP/DTP_Config.h
index 4ae17614764..6deddf381de 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_Config.h
+++ b/TAO/tao/Dynamic_TP/DTP_Config.h
@@ -53,17 +53,17 @@ struct TAO_Dynamic_TP_Export TAO_DTP_Definition
 
 };
 
-class TAO_Dynamic_TP_Export TAO_Dynamic_TP_Config_Registry_Installer
+class TAO_Dynamic_TP_Export TAO_DTP_Config_Registry_Installer
 {
  public:
-  TAO_Dynamic_TP_Config_Registry_Installer (void);
+  TAO_DTP_Config_Registry_Installer (void);
 };
 
-class TAO_Dynamic_TP_Export TAO_Dynamic_TP_Config_Registry : public ACE_Service_Object
+class TAO_Dynamic_TP_Export TAO_DTP_Config_Registry : public ACE_Service_Object
 {
 public:
-  TAO_Dynamic_TP_Config_Registry (void);
-  virtual ~TAO_Dynamic_TP_Config_Registry (void);
+  TAO_DTP_Config_Registry (void);
+  virtual ~TAO_DTP_Config_Registry (void);
 
   virtual int init (int argc, ACE_TCHAR* []);
 
@@ -78,14 +78,14 @@ public:
   Registry registry_;
 };
 
-class TAO_Dynamic_TP_Export TAO_Dynamic_TP_Config : public ACE_Service_Object
+class TAO_Dynamic_TP_Export TAO_DTP_Config : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  TAO_Dynamic_TP_Config (void);
+  TAO_DTP_Config (void);
 
   /// Destructor.
-  virtual ~TAO_Dynamic_TP_Config (void);
+  virtual ~TAO_DTP_Config (void);
 
   /// Read a definition parameter set from the supplied args.
   /// There must be a -TPName argument, which, if replicated will cause the set to be ignored, unless -TPOverwrite is also set
@@ -107,14 +107,14 @@ private:
 
 };
 
-static TAO_Dynamic_TP_Config_Registry_Installer config_installer;
+static TAO_DTP_Config_Registry_Installer config_installer;
 
 
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Dynamic_TP, TAO_Dynamic_TP_Config_Registry)
-ACE_FACTORY_DECLARE (TAO_Dynamic_TP, TAO_Dynamic_TP_Config_Registry)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Dynamic_TP, TAO_DTP_Config_Registry)
+ACE_FACTORY_DECLARE (TAO_Dynamic_TP, TAO_DTP_Config_Registry)
 
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Dynamic_TP, TAO_Dynamic_TP_Config)
-ACE_FACTORY_DECLARE (TAO_Dynamic_TP, TAO_Dynamic_TP_Config)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Dynamic_TP, TAO_DTP_Config)
+ACE_FACTORY_DECLARE (TAO_Dynamic_TP, TAO_DTP_Config)
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_ORBInitializer.cpp b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp
index 48732e1554b..81dac29403e 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_ORBInitializer.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Dynamic_TP/Dynamic_TP_ORBInitializer.h"
+#include "tao/Dynamic_TP/DTP_ORBInitializer.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -27,7 +27,7 @@
 #include "tao/RTCORBA/RT_Service_Context_Handler.h"
 #endif
 
-#include "tao/Dynamic_TP/Dynamic_TP_Config.h"
+#include "tao/Dynamic_TP/DTP_Config.h"
 #include "tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h"
 #include "tao/Dynamic_TP/DTP_Thread_Pool.h"
 #include "tao/Exception.h"
@@ -40,24 +40,24 @@
 #include "ace/Sched_Params.h"
 
 #if 0
-static const char rt_poa_factory_name[] = "TAO_Dynamic_TP_Object_Adapter_Factory";
+static const char rt_poa_factory_name[] = "TAO_DTP_Object_Adapter_Factory";
 static const ACE_TCHAR rt_poa_factory_directive[] =
   ACE_DYNAMIC_SERVICE_DIRECTIVE(
-    "TAO_Dynamic_TP_Object_Adapter_Factory",
+    "TAO_DTP_Object_Adapter_Factory",
     "TAO_RTPortableServer",
-    "_make_TAO_Dynamic_TP_Object_Adapter_Factory",
+    "_make_TAO_DTP_Object_Adapter_Factory",
     "");
 #endif
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Dynamic_TP_ORBInitializer::TAO_Dynamic_TP_ORBInitializer (/*const ACE_CString &tplist*/)
+TAO_DTP_ORBInitializer::TAO_DTP_ORBInitializer (/*const ACE_CString &tplist*/)
 {
 
 }
 
 void
-TAO_Dynamic_TP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info)
+TAO_DTP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info)
 {
   TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info);
 
@@ -65,7 +65,7 @@ TAO_Dynamic_TP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr in
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) TAO_Dynamic_TP_ORBInitializer::pre_init:\n"
+                    "(%P|%t) TAO_DTP_ORBInitializer::pre_init:\n"
                     "(%P|%t)    Unable to narrow "
                     "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
                     "(%P|%t)   \"TAO_ORBInitInfo *.\"\n"));
@@ -79,7 +79,7 @@ TAO_Dynamic_TP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr in
   ACE_Service_Object * const config_obj =
     ACE_Dynamic_Service<ACE_Service_Object>::instance (
       gestalt,
-      "Dynamic_TP_Config",
+      "DTP_Config",
       true);
   if (config_obj == 0)
     {
@@ -87,13 +87,13 @@ TAO_Dynamic_TP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr in
       return;
     }
 
-  TAO_Dynamic_TP_Config *config_mgr = dynamic_cast<TAO_Dynamic_TP_Config *>(config_obj);
+  TAO_DTP_Config *config_mgr = dynamic_cast<TAO_DTP_Config *>(config_obj);
   if (config_mgr == 0)
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) TAO_Dynamic_TP_ORBInitializer::pre_init:\n")
-                    ACE_TEXT ("(%P|%t)   Unable to resolve Dynamic_TP_Config object\n")));
+                    ACE_TEXT ("(%P|%t) TAO_DTP_ORBInitializer::pre_init:\n")
+                    ACE_TEXT ("(%P|%t)   Unable to resolve DTP_Config object\n")));
 
       throw ::CORBA::INTERNAL ();
     }
@@ -105,7 +105,7 @@ TAO_Dynamic_TP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr in
 }
 
 void
-TAO_Dynamic_TP_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
+TAO_DTP_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 {
   TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info);
 
@@ -119,10 +119,10 @@ TAO_Dynamic_TP_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr i
 
   if (dtp_name != 0 && dtp_name[0] != 0)
     {
-      TAO_Dynamic_TP_Config_Registry *config_registry =
-        dynamic_cast<TAO_Dynamic_TP_Config_Registry *>
+      TAO_DTP_Config_Registry *config_registry =
+        dynamic_cast<TAO_DTP_Config_Registry *>
         (ACE_Dynamic_Service<ACE_Service_Object>::instance
-         (gestalt, "Dynamic_TP_Config_Registry", true));
+         (gestalt, "DTP_Config_Registry", true));
 
       TAO_DTP_Definition def;
 
@@ -130,8 +130,8 @@ TAO_Dynamic_TP_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr i
         {
           if (TAO_debug_level > 0)
             ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) TAO_Dynamic_TP_ORBInitializer::pre_init:\n")
-                        ACE_TEXT ("(%P|%t)   Unable to resolve Dynamic_TP_Config object\n")));
+                        ACE_TEXT ("(%P|%t) TAO_DTP_ORBInitializer::pre_init:\n")
+                        ACE_TEXT ("(%P|%t)   Unable to resolve DTP_Config object\n")));
 
           throw ::CORBA::INTERNAL ();
         }
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_ORBInitializer.h b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
index c362b418ead..770ac31b50d 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_ORBInitializer.h
+++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file Dynamic_TP_ORBInitializer.h
+ *  @file DTP_ORBInitializer.h
  *
  *  $Id$
  *
@@ -39,13 +39,13 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Dynamic_TP ORB initializer.
-class TAO_Dynamic_TP_ORBInitializer
+class TAO_DTP_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
   , public virtual ::CORBA::LocalObject
 {
 public:
 
-  TAO_Dynamic_TP_ORBInitializer (void);
+  TAO_DTP_ORBInitializer (void);
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_ORB_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp
index 89cc8f63309..984abc5d438 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_ORB_Loader.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "tao/Dynamic_TP/Dynamic_TP_ORB_Loader.h"
+#include "tao/Dynamic_TP/DTP_ORB_Loader.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/Dynamic_TP/Dynamic_TP_ORBInitializer.h"
+#include "tao/Dynamic_TP/DTP_ORBInitializer.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
@@ -16,19 +16,19 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Dynamic_TP_ORB_Loader::TAO_Dynamic_TP_ORB_Loader (void)
+TAO_DTP_ORB_Loader::TAO_DTP_ORB_Loader (void)
   : initialized_ (false)
 {
 }
 
-TAO_Dynamic_TP_ORB_Loader::~TAO_Dynamic_TP_ORB_Loader (void)
+TAO_DTP_ORB_Loader::~TAO_DTP_ORB_Loader (void)
 {
 }
 
 int
-TAO_Dynamic_TP_ORB_Loader::init (int argc, ACE_TCHAR* argv[])
+TAO_DTP_ORB_Loader::init (int argc, ACE_TCHAR* argv[])
 {
-  ACE_TRACE ("TAO_Dynamic_TP_ORB_Loader::init");
+  ACE_TRACE ("TAO_DTP_ORB_Loader::init");
 
   // Only allow initialization once.
   if (this->initialized_)
@@ -46,7 +46,7 @@ TAO_Dynamic_TP_ORB_Loader::init (int argc, ACE_TCHAR* argv[])
               if (TAO_debug_level > 0)
                 {
                   ACE_DEBUG ((LM_DEBUG,
-                              ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_ORB_Loader - ")
+                              ACE_TEXT ("TAO (%P|%t) - DTP_ORB_Loader - ")
                               ACE_TEXT ("DTPORB arbument missing value\n")));
                 }
               return -1;
@@ -57,7 +57,7 @@ TAO_Dynamic_TP_ORB_Loader::init (int argc, ACE_TCHAR* argv[])
           if (TAO_debug_level > 0)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_ORB_Loader -")
+                          ACE_TEXT ("TAO (%P|%t) - DTP_ORB_Loader -")
                           ACE_TEXT (" Unrecognized argv[%d], %C\n"),
                           curarg, argv[curarg]));
             }
@@ -73,7 +73,7 @@ TAO_Dynamic_TP_ORB_Loader::init (int argc, ACE_TCHAR* argv[])
 
       /// Register the DynamicTP ORBInitializer.
       ACE_NEW_THROW_EX (temp_orb_initializer,
-                        TAO_Dynamic_TP_ORBInitializer (),
+                        TAO_DTP_ORBInitializer (),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
                             TAO::VMCID,
@@ -99,11 +99,11 @@ TAO_Dynamic_TP_ORB_Loader::init (int argc, ACE_TCHAR* argv[])
 
 /////////////////////////////////////////////////////////////////////
 
-ACE_FACTORY_DEFINE (TAO_Dynamic_TP, TAO_Dynamic_TP_ORB_Loader)
-ACE_STATIC_SVC_DEFINE (TAO_Dynamic_TP_ORB_Loader,
-                       ACE_TEXT ("Dynamic_TP_ORB_Loader"),
+ACE_FACTORY_DEFINE (TAO_Dynamic_TP, TAO_DTP_ORB_Loader)
+ACE_STATIC_SVC_DEFINE (TAO_DTP_ORB_Loader,
+                       ACE_TEXT ("DTP_ORB_Loader"),
                        ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Dynamic_TP_ORB_Loader),
+                       &ACE_SVC_NAME (TAO_DTP_ORB_Loader),
                        ACE_Service_Type::DELETE_THIS
                        | ACE_Service_Type::DELETE_OBJ,
                        0)
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_ORB_Loader.h b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
index 476c7e2b156..ffef32befd2 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_ORB_Loader.h
+++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file    Dynamic_TP_ORB_Loader.h
+ *  @file    DTP_ORB_Loader.h
  *
  *  $Id$
  *
@@ -33,15 +33,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 
-class TAO_Dynamic_TP_Export TAO_Dynamic_TP_ORB_Loader : public ACE_Service_Object
+class TAO_Dynamic_TP_Export TAO_DTP_ORB_Loader : public ACE_Service_Object
 {
 public:
 
   /// Constructor.
-  TAO_Dynamic_TP_ORB_Loader (void);
+  TAO_DTP_ORB_Loader (void);
 
   /// Destructor.
-  virtual ~TAO_Dynamic_TP_ORB_Loader (void);
+  virtual ~TAO_DTP_ORB_Loader (void);
 
   /// Initialize the DynamicTP loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
@@ -52,8 +52,8 @@ private:
 };
 
 
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Dynamic_TP, TAO_Dynamic_TP_ORB_Loader)
-ACE_FACTORY_DECLARE (TAO_Dynamic_TP, TAO_Dynamic_TP_ORB_Loader)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Dynamic_TP, TAO_DTP_ORB_Loader)
+ACE_FACTORY_DECLARE (TAO_Dynamic_TP, TAO_DTP_ORB_Loader)
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_POA_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp
index c00266f37b0..cf5320e6a15 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_POA_Loader.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp
@@ -1,13 +1,13 @@
 // $Id$
 
-#include "tao/Dynamic_TP/Dynamic_TP_POA_Loader.h"
+#include "tao/Dynamic_TP/DTP_POA_Loader.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #include "tao/debug.h"
 #include "tao/CSD_Framework/CSD_Framework_Loader.h"
-#include "tao/Dynamic_TP/Dynamic_TP_Config.h"
-#include "tao/Dynamic_TP/Dynamic_TP_POA_Strategy.h"
+#include "tao/Dynamic_TP/DTP_Config.h"
+#include "tao/Dynamic_TP/DTP_POA_Strategy.h"
 #include "ace/OS_NS_strings.h"
 #include "tao/CSD_Framework/CSD_ORBInitializer.h"
 #include "tao/PI/DLL_Resident_ORB_Initializer.h"
@@ -17,20 +17,20 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Dynamic_TP_POA_Loader::TAO_Dynamic_TP_POA_Loader (void)
+TAO_DTP_POA_Loader::TAO_DTP_POA_Loader (void)
 {
 }
 
-TAO_Dynamic_TP_POA_Loader::~TAO_Dynamic_TP_POA_Loader (void)
+TAO_DTP_POA_Loader::~TAO_DTP_POA_Loader (void)
 {
 }
 
 int
-TAO_Dynamic_TP_POA_Loader::init (int argc, ACE_TCHAR* argv[])
+TAO_DTP_POA_Loader::init (int argc, ACE_TCHAR* argv[])
 {
   //TAO_debug_level = 5;
 
-  ACE_TRACE ("TAO_Dynamic_TP_POA_Loader::init");
+  ACE_TRACE ("TAO_DTP_POA_Loader::init");
 
   // Only allow initialization once.
   static bool initialized = false;
@@ -59,7 +59,7 @@ TAO_Dynamic_TP_POA_Loader::init (int argc, ACE_TCHAR* argv[])
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG((LM_DEBUG,
-                     ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_POA_Loader - ")
+                     ACE_TEXT ("TAO (%P|%t) - DTP_POA_Loader - ")
                      ACE_TEXT ("cannot initialize strategy repo\n")));
         }
       return -1;
@@ -73,7 +73,7 @@ TAO_Dynamic_TP_POA_Loader::init (int argc, ACE_TCHAR* argv[])
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG((LM_DEBUG,
-                     ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_POA_Loader - parsing args\n")));
+                     ACE_TEXT ("TAO (%P|%t) - DTP_POA_Loader - parsing args\n")));
         }
 
       if (ACE_OS::strcasecmp (argv[curarg], ACE_TEXT ("-DTPPOAConfigMap")) == 0)
@@ -100,7 +100,7 @@ TAO_Dynamic_TP_POA_Loader::init (int argc, ACE_TCHAR* argv[])
           if (TAO_debug_level > 0)
             {
               ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("Dynamic_TP_POA_Loader: Missing option\n")
+                          ACE_TEXT ("DTP_POA_Loader: Missing option\n")
                           ACE_TEXT ("Usage: -DTPPOAConfigMap <comma-separated ")
                           ACE_TEXT ("list of POAs>:<POA Config Name>\n")
                           ACE_TEXT ("<%s>.\n"),
@@ -115,13 +115,13 @@ TAO_Dynamic_TP_POA_Loader::init (int argc, ACE_TCHAR* argv[])
 
 
 int
-TAO_Dynamic_TP_POA_Loader::load_poa_map (ACE_TCHAR *map,
+TAO_DTP_POA_Loader::load_poa_map (ACE_TCHAR *map,
                                          TAO_CSD_Strategy_Repository *repo)
 {
 
   ACE_CString poa_name;
   ACE_CString config_name;
-  TAO_Dynamic_TP_POA_Strategy * strategy_container = 0;
+  TAO_DTP_POA_Strategy * strategy_container = 0;
 
   ACE_TCHAR *sep = ACE_OS::strchr (map, ':');
 
@@ -130,7 +130,7 @@ TAO_Dynamic_TP_POA_Loader::load_poa_map (ACE_TCHAR *map,
       if (TAO_debug_level > 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Dynamic_TP_POA_Loader: Missing option\n")
+                      ACE_TEXT ("DTP_POA_Loader: Missing option\n")
                       ACE_TEXT ("Usage: -DTPPOAConfigMap <comma-separated ")
                       ACE_TEXT ("list of POAs>:<POA Config Name>\n<%s>.\n"),
                       map));
@@ -146,7 +146,7 @@ TAO_Dynamic_TP_POA_Loader::load_poa_map (ACE_TCHAR *map,
   // strategy configuration container.
 
   ACE_NEW_RETURN(strategy_container,
-                 TAO_Dynamic_TP_POA_Strategy(config_name,
+                 TAO_DTP_POA_Strategy(config_name,
                                              false), -1);
 
   sep = ACE_OS::strchr (map, ',');
@@ -165,13 +165,13 @@ TAO_Dynamic_TP_POA_Loader::load_poa_map (ACE_TCHAR *map,
 }
 
 void
-TAO_Dynamic_TP_POA_Loader::report_option_value_error (const ACE_TCHAR* name,
+TAO_DTP_POA_Loader::report_option_value_error (const ACE_TCHAR* name,
                                                       const ACE_TCHAR* value)
 {
   if (TAO_debug_level > 0)
     {
       ACE_DEBUG((LM_DEBUG,
-                 ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_POA_Loader - unknown ")
+                 ACE_TEXT ("TAO (%P|%t) - DTP_POA_Loader - unknown ")
                  ACE_TEXT ("argument <%s> for <%s>\n"),
                  value, name));
     }
@@ -181,11 +181,11 @@ TAO_Dynamic_TP_POA_Loader::report_option_value_error (const ACE_TCHAR* name,
 /////////////////////////////////////////////////////////////////////
 
 
-ACE_FACTORY_DEFINE (TAO_Dynamic_TP, TAO_Dynamic_TP_POA_Loader)
-ACE_STATIC_SVC_DEFINE (TAO_Dynamic_TP_POA_Loader,
-                       ACE_TEXT ("Dynamic_TP_POA_Loader"),
+ACE_FACTORY_DEFINE (TAO_Dynamic_TP, TAO_DTP_POA_Loader)
+ACE_STATIC_SVC_DEFINE (TAO_DTP_POA_Loader,
+                       ACE_TEXT ("DTP_POA_Loader"),
                        ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Dynamic_TP_POA_Loader),
+                       &ACE_SVC_NAME (TAO_DTP_POA_Loader),
                        ACE_Service_Type::DELETE_THIS
                        | ACE_Service_Type::DELETE_OBJ,
                        0)
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_POA_Loader.h b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
index 567370f8675..9fba1917330 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_POA_Loader.h
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file    Dynamic_TP_POA_Loader.h
+ *  @file    DTP_POA_Loader.h
  *
  *  $Id$
  *
@@ -18,7 +18,7 @@
 #include /**/ "ace/pre.h"
 #include "tao/orbconf.h"
 #include "tao/Dynamic_TP/dynamic_tp_export.h"
-#include "tao/Dynamic_TP/Dynamic_TP_Config.h"
+#include "tao/Dynamic_TP/DTP_Config.h"
 #include "tao/CSD_Framework/CSD_Strategy_Repository.h"
 #include "ace/Synch.h"
 #include "ace/Service_Object.h"
@@ -33,15 +33,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_POA_Core; //TODO: Do we still need this?
 
-class TAO_Dynamic_TP_Export TAO_Dynamic_TP_POA_Loader : public ACE_Service_Object
+class TAO_Dynamic_TP_Export TAO_DTP_POA_Loader : public ACE_Service_Object
 {
 public:
 
   /// Constructor.
-  TAO_Dynamic_TP_POA_Loader (void);
+  TAO_DTP_POA_Loader (void);
 
   /// Destructor.
-  virtual ~TAO_Dynamic_TP_POA_Loader (void);
+  virtual ~TAO_DTP_POA_Loader (void);
 
   /// Initialize the DynamicTP loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
@@ -55,8 +55,8 @@ private:
                                   const ACE_TCHAR* option_value);
 };
 
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Dynamic_TP, TAO_Dynamic_TP_POA_Loader)
-ACE_FACTORY_DECLARE (TAO_Dynamic_TP, TAO_Dynamic_TP_POA_Loader)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Dynamic_TP, TAO_DTP_POA_Loader)
+ACE_FACTORY_DECLARE (TAO_Dynamic_TP, TAO_DTP_POA_Loader)
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_POA_Strategy.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp
index 8d3ec1a48c5..ddc9d44f7d8 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_POA_Strategy.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Dynamic_TP/Dynamic_TP_POA_Strategy.h"
+#include "tao/Dynamic_TP/DTP_POA_Strategy.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h"
@@ -13,18 +13,18 @@
 
 
 #if !defined (__ACE_INLINE__)
-#include "tao/Dynamic_TP/Dynamic_TP_POA_Strategy.inl"
+#include "tao/Dynamic_TP/DTP_POA_Strategy.inl"
 #endif /* ! __ACE_INLINE__ */
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
-TAO_Dynamic_TP_POA_Strategy::~TAO_Dynamic_TP_POA_Strategy()
+TAO_DTP_POA_Strategy::~TAO_DTP_POA_Strategy()
 {
 }
 
-TAO_Dynamic_TP_POA_Strategy::CustomRequestOutcome
-TAO_Dynamic_TP_POA_Strategy::custom_synch_request(TAO::CSD::TP_Custom_Request_Operation* op)
+TAO_DTP_POA_Strategy::CustomRequestOutcome
+TAO_DTP_POA_Strategy::custom_synch_request(TAO::CSD::TP_Custom_Request_Operation* op)
 {
 
   TAO::CSD::TP_Servant_State::HandleType servant_state =
@@ -43,8 +43,8 @@ TAO_Dynamic_TP_POA_Strategy::custom_synch_request(TAO::CSD::TP_Custom_Request_Op
   return (request->wait()) ? REQUEST_EXECUTED : REQUEST_CANCELLED;
 }
 
-TAO_Dynamic_TP_POA_Strategy::CustomRequestOutcome
-TAO_Dynamic_TP_POA_Strategy::custom_asynch_request(TAO::CSD::TP_Custom_Request_Operation* op)
+TAO_DTP_POA_Strategy::CustomRequestOutcome
+TAO_DTP_POA_Strategy::custom_asynch_request(TAO::CSD::TP_Custom_Request_Operation* op)
 {
 
   TAO::CSD::TP_Servant_State::HandleType servant_state =
@@ -58,7 +58,7 @@ TAO_Dynamic_TP_POA_Strategy::custom_asynch_request(TAO::CSD::TP_Custom_Request_O
 }
 
 bool
-TAO_Dynamic_TP_POA_Strategy::poa_activated_event_i(TAO_ORB_Core& orb_core)
+TAO_DTP_POA_Strategy::poa_activated_event_i(TAO_ORB_Core& orb_core)
 {
 
   this->dtp_task_.thr_mgr(orb_core.thr_mgr());
@@ -67,16 +67,16 @@ TAO_Dynamic_TP_POA_Strategy::poa_activated_event_i(TAO_ORB_Core& orb_core)
 
   if (!this->config_initialized_)
     {
-      TAO_Dynamic_TP_Config_Registry * config_repo =
-      ACE_Dynamic_Service<TAO_Dynamic_TP_Config_Registry>::instance
-      ("Dynamic_TP_Config_Registry");
+      TAO_DTP_Config_Registry * config_repo =
+      ACE_Dynamic_Service<TAO_DTP_Config_Registry>::instance
+      ("DTP_Config_Registry");
 
       if (config_repo == 0)
         {
           if (TAO_debug_level > 0)
             {
               ACE_DEBUG((LM_DEBUG,
-              ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_POA_Strategy - ")
+              ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy - ")
               ACE_TEXT ("cannot retrieve configuration repo\n")));
             }
           return false;
@@ -87,7 +87,7 @@ TAO_Dynamic_TP_POA_Strategy::poa_activated_event_i(TAO_ORB_Core& orb_core)
           if (!config_repo->find(this->dynamic_tp_config_name_, config_entry))
             {
                   ACE_DEBUG((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_POA_Strategy - ")
+                  ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy - ")
                   ACE_TEXT ("warning: config not found...using defaults!\n")));
 
             }
@@ -108,7 +108,7 @@ TAO_Dynamic_TP_POA_Strategy::poa_activated_event_i(TAO_ORB_Core& orb_core)
 }
 
 void
-TAO_Dynamic_TP_POA_Strategy::poa_deactivated_event_i()
+TAO_DTP_POA_Strategy::poa_deactivated_event_i()
 {
   // Passing in a value of 1 means that we want to shutdown the task, which
   // equates to causing all worker threads to shutdown.  The worker threads
@@ -119,7 +119,7 @@ TAO_Dynamic_TP_POA_Strategy::poa_deactivated_event_i()
 }
 
 TAO::CSD::Strategy_Base::DispatchResult
-TAO_Dynamic_TP_POA_Strategy::dispatch_remote_request_i
+TAO_DTP_POA_Strategy::dispatch_remote_request_i
                              (TAO_ServerRequest&              server_request,
                               const PortableServer::ObjectId& object_id,
                               PortableServer::POA_ptr         poa,
@@ -156,7 +156,7 @@ TAO_Dynamic_TP_POA_Strategy::dispatch_remote_request_i
 }
 
 TAO::CSD::Strategy_Base::DispatchResult
-TAO_Dynamic_TP_POA_Strategy::dispatch_collocated_request_i
+TAO_DTP_POA_Strategy::dispatch_collocated_request_i
                              (TAO_ServerRequest&              server_request,
                               const PortableServer::ObjectId& object_id,
                               PortableServer::POA_ptr         poa,
@@ -250,7 +250,7 @@ TAO_Dynamic_TP_POA_Strategy::dispatch_collocated_request_i
 }
 
 void
-TAO_Dynamic_TP_POA_Strategy::servant_activated_event_i
+TAO_DTP_POA_Strategy::servant_activated_event_i
                                 (PortableServer::Servant servant,
                                  const PortableServer::ObjectId&)
 {
@@ -262,7 +262,7 @@ TAO_Dynamic_TP_POA_Strategy::servant_activated_event_i
 }
 
 void
-TAO_Dynamic_TP_POA_Strategy::servant_deactivated_event_i
+TAO_DTP_POA_Strategy::servant_deactivated_event_i
                                 (PortableServer::Servant servant,
                                  const PortableServer::ObjectId&)
 {
@@ -277,14 +277,14 @@ TAO_Dynamic_TP_POA_Strategy::servant_deactivated_event_i
 }
 
 void
-TAO_Dynamic_TP_POA_Strategy::cancel_requests(PortableServer::Servant servant)
+TAO_DTP_POA_Strategy::cancel_requests(PortableServer::Servant servant)
 {
   // Cancel all requests stuck in the queue for the specified servant.
   this->dtp_task_.cancel_servant(servant);
 }
 
 TAO::CSD::TP_Servant_State::HandleType
-TAO_Dynamic_TP_POA_Strategy::get_servant_state(PortableServer::Servant servant)
+TAO_DTP_POA_Strategy::get_servant_state(PortableServer::Servant servant)
 {
   TAO::CSD::TP_Servant_State::HandleType servant_state;
 
@@ -297,7 +297,7 @@ TAO_Dynamic_TP_POA_Strategy::get_servant_state(PortableServer::Servant servant)
 }
 
 void
-TAO_Dynamic_TP_POA_Strategy::set_dtp_config(TAO_DTP_Definition &tp_config)
+TAO_DTP_POA_Strategy::set_dtp_config(TAO_DTP_Definition &tp_config)
 {
 
   if (tp_config.min_threads_ <= 0)
@@ -363,14 +363,14 @@ TAO_Dynamic_TP_POA_Strategy::set_dtp_config(TAO_DTP_Definition &tp_config)
     if (TAO_debug_level > 4)
     {
           ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_POA_Strategy: ")
+          ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy: ")
           ACE_TEXT ("Initialized with:\n")
-          ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_POA_Strategy initial_pool_threads_=[%d]\n")
-          ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_POA_Strategy min_pool_threads_=[%d]\n")
-          ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_POA_Strategy max_pool_threads_=[%d]\n")
-          ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_POA_Strategy max_request_queue_depth_=[%d]\n")
-          ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_POA_Strategy thread_stack_size_=[%d]\n")
-          ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_POA_Strategy thread_idle_time_=[%d]\n"),
+          ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy initial_pool_threads_=[%d]\n")
+          ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy min_pool_threads_=[%d]\n")
+          ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy max_pool_threads_=[%d]\n")
+          ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy max_request_queue_depth_=[%d]\n")
+          ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy thread_stack_size_=[%d]\n")
+          ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy thread_idle_time_=[%d]\n"),
           this->dtp_task_.get_init_pool_threads(),
           this->dtp_task_.get_min_pool_threads(),
           this->dtp_task_.get_max_pool_threads(),
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_POA_Strategy.h b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
index 5e96fc98f81..51533e334b1 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_POA_Strategy.h
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file    Dynamic_TP_POA_Strategy.h
+ *  @file    DTP_POA_Strategy.h
  *
  *  $Id$
  *
@@ -15,8 +15,8 @@
 
 #include /**/ "ace/pre.h"
 #include "tao/Dynamic_TP/dynamic_tp_export.h"
-#include "tao/Dynamic_TP/Dynamic_TP_Config.h"
-#include "tao/Dynamic_TP/Dynamic_TP_Task.h"
+#include "tao/Dynamic_TP/DTP_Config.h"
+#include "tao/Dynamic_TP/DTP_Task.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
@@ -33,9 +33,9 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
-class TAO_Dynamic_TP_POA_Strategy;
-typedef TAO_Intrusive_Ref_Count_Handle<TAO_Dynamic_TP_POA_Strategy>
-        TAO_Dynamic_TP_POA_Strategy_Handle;
+class TAO_DTP_POA_Strategy;
+typedef TAO_Intrusive_Ref_Count_Handle<TAO_DTP_POA_Strategy>
+        TAO_DTP_POA_Strategy_Handle;
 
 namespace TAO
 {
@@ -47,12 +47,12 @@ namespace TAO
 
 
 /**
- * @class TAO_Dynamic_TP_POA_Strategy
+ * @class TAO_DTP_POA_Strategy
  *
  * @brief
  *
  */
-class TAO_Dynamic_TP_Export TAO_Dynamic_TP_POA_Strategy:
+class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy:
   public TAO::CSD::Strategy_Base
 {
  public:
@@ -62,17 +62,17 @@ class TAO_Dynamic_TP_Export TAO_Dynamic_TP_POA_Strategy:
   /// of a thread pool for POAs is initiated from a svc.conf file.
   /// A configuration name is passed in such that the object can
   /// lookup a configuration in a pre-populated repository.
-  TAO_Dynamic_TP_POA_Strategy(ACE_CString tp_config_name,
+  TAO_DTP_POA_Strategy(ACE_CString tp_config_name,
                               bool     serialize_servants = true);
 
   /// This constructor supports situations where explicit instantiation
   /// of a thread pool for POAs is initiated from an application, such as
   /// the use of the apply_to() method.
-  TAO_Dynamic_TP_POA_Strategy(TAO_DTP_Definition * tp_config,
+  TAO_DTP_POA_Strategy(TAO_DTP_Definition * tp_config,
                               bool     serialize_servants = true);
 
   /// Virtual Destructor.
-  virtual ~TAO_Dynamic_TP_POA_Strategy();
+  virtual ~TAO_DTP_POA_Strategy();
 
   /// Turn on/off serialization of servants.
   void set_servant_serialization(bool serialize_servants);
@@ -183,7 +183,7 @@ class TAO_Dynamic_TP_Export TAO_Dynamic_TP_POA_Strategy:
   TAO::CSD::TP_Servant_State_Map servant_state_map_;
 
   /// This holds the name of a configuration that have been loaded
-  /// into a Dynamic_TP_Config_Registry.  This is the key to the RB
+  /// into a DTP_Config_Registry.  This is the key to the RB
   /// Tree entry.
 
   ACE_CString dynamic_tp_config_name_;
@@ -193,7 +193,7 @@ class TAO_Dynamic_TP_Export TAO_Dynamic_TP_POA_Strategy:
   /// The strategy object puts requests into the task's request
   /// queue, and the worker threads service the queued requests
   /// by performing the actual servant request dispatching logic.
-  TAO_Dynamic_TP_Task dtp_task_;
+  TAO_DTP_Task dtp_task_;
 
 
   /// This boolean is used to determine if the configuration has
@@ -212,7 +212,7 @@ class TAO_Dynamic_TP_Export TAO_Dynamic_TP_POA_Strategy:
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "tao/Dynamic_TP/Dynamic_TP_POA_Strategy.inl"
+#include "tao/Dynamic_TP/DTP_POA_Strategy.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_POA_Strategy.inl b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.inl
index aec25abe33e..bd6171bf599 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_POA_Strategy.inl
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.inl
@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 /// Constructor.
-TAO_Dynamic_TP_POA_Strategy::TAO_Dynamic_TP_POA_Strategy
+TAO_DTP_POA_Strategy::TAO_DTP_POA_Strategy
 (ACE_CString tp_config_name,
  bool ss)
   : serialize_servants_ (ss),
@@ -16,7 +16,7 @@ TAO_Dynamic_TP_POA_Strategy::TAO_Dynamic_TP_POA_Strategy
 }
 
 ACE_INLINE
-TAO_Dynamic_TP_POA_Strategy::TAO_Dynamic_TP_POA_Strategy
+TAO_DTP_POA_Strategy::TAO_DTP_POA_Strategy
 (TAO_DTP_Definition * tp_config,
  bool ss)
   : serialize_servants_ (ss),
@@ -29,7 +29,7 @@ TAO_Dynamic_TP_POA_Strategy::TAO_Dynamic_TP_POA_Strategy
 
 ACE_INLINE
 void
-TAO_Dynamic_TP_POA_Strategy::set_servant_serialization(bool serialize_servants)
+TAO_DTP_POA_Strategy::set_servant_serialization(bool serialize_servants)
 {
   // Simple Mutator.
   this->serialize_servants_ = serialize_servants;
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_Task.cpp b/TAO/tao/Dynamic_TP/DTP_Task.cpp
index 89f8fde099c..377f5c70779 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_Task.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Task.cpp
@@ -1,17 +1,17 @@
 // $Id$
 
-#include "tao/Dynamic_TP/Dynamic_TP_Task.h"
+#include "tao/Dynamic_TP/DTP_Task.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Request.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Dynamic_TP/Dynamic_TP_Task.inl"
+# include "tao/Dynamic_TP/DTP_Task.inl"
 #endif /* ! __ACE_INLINE__ */
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Dynamic_TP_Task::TAO_Dynamic_TP_Task()
+TAO_DTP_Task::TAO_DTP_Task()
   : aw_lock_(),
     queue_lock_(),
     work_lock_(),
@@ -24,12 +24,12 @@ TAO_Dynamic_TP_Task::TAO_Dynamic_TP_Task()
 {
 }
 
-TAO_Dynamic_TP_Task::~TAO_Dynamic_TP_Task()
+TAO_DTP_Task::~TAO_DTP_Task()
 {
 }
 
 bool
-TAO_Dynamic_TP_Task::add_request(TAO::CSD::TP_Request* request)
+TAO_DTP_Task::add_request(TAO::CSD::TP_Request* request)
 {
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->queue_lock_, false);
@@ -45,9 +45,9 @@ TAO_Dynamic_TP_Task::add_request(TAO::CSD::TP_Request* request)
         if (TAO_debug_level > 4)
           {
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::add_request() not accepting requests.\n")
-                        ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::add_request() num_queue_requests_ : [%d]\n")
-                        ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::add_request() max_request_queue_depth_ : [%d]\n"),
+                        ACE_TEXT ("TAO (%P|%t) - DTP_Task::add_request() not accepting requests.\n")
+                        ACE_TEXT ("TAO (%P|%t) - DTP_Task::add_request() num_queue_requests_ : [%d]\n")
+                        ACE_TEXT ("TAO (%P|%t) - DTP_Task::add_request() max_request_queue_depth_ : [%d]\n"),
                         this->num_queue_requests_,
                         this->max_request_queue_depth_));
           }
@@ -71,7 +71,7 @@ TAO_Dynamic_TP_Task::add_request(TAO::CSD::TP_Request* request)
     this->work_available_.signal();
     if (TAO_debug_level > 4 )
       {
-        ACE_DEBUG((LM_DEBUG,"TAO (%P|%t) - Dynamic_TP_Task::add_request() - "
+        ACE_DEBUG((LM_DEBUG,"TAO (%P|%t) - DTP_Task::add_request() - "
                    "work available\n"));
       }
   }
@@ -79,43 +79,43 @@ TAO_Dynamic_TP_Task::add_request(TAO::CSD::TP_Request* request)
   return true;
 }
 
-size_t 
-TAO_Dynamic_TP_Task::get_init_pool_threads()
+size_t
+TAO_DTP_Task::get_init_pool_threads()
 {
   return(this->init_pool_threads_);
 }
 
-size_t 
-TAO_Dynamic_TP_Task::get_min_pool_threads()
+size_t
+TAO_DTP_Task::get_min_pool_threads()
 {
   return(this->min_pool_threads_);
 }
 
-size_t TAO_Dynamic_TP_Task::get_max_pool_threads()
+size_t TAO_DTP_Task::get_max_pool_threads()
 {
   return(this->max_pool_threads_);
 }
 
-size_t 
-TAO_Dynamic_TP_Task::get_max_request_queue_depth()
+size_t
+TAO_DTP_Task::get_max_request_queue_depth()
 {
   return(this->max_request_queue_depth_);
 }
 
-size_t 
-TAO_Dynamic_TP_Task::get_thread_stack_size()
+size_t
+TAO_DTP_Task::get_thread_stack_size()
 {
   return(this->thread_stack_size_);
 }
 
-time_t 
-TAO_Dynamic_TP_Task::get_thread_idle_time()
+time_t
+TAO_DTP_Task::get_thread_idle_time()
 {
   return(this->thread_idle_time_.sec());
 }
 
 int
-TAO_Dynamic_TP_Task::open()//void* args)
+TAO_DTP_Task::open(void* /* args */)
 {
   size_t num = 1;
 
@@ -125,7 +125,7 @@ TAO_Dynamic_TP_Task::open()//void* args)
   //  {
   //    //FUZZ: disable check_for_lack_ACE_OS
   //    ACE_ERROR_RETURN ((LM_ERROR,
-  //                       ACE_TEXT ("(%P|%t) Dynamic_TP_Task::open() failed to open.  ")
+  //                       ACE_TEXT ("(%P|%t) DTP_Task::open() failed to open.  ")
   //                       ACE_TEXT ("Invalid argument type passed to open().\n")),
   //                      -1);
   //    //FUZZ: enable check_for_lack_ACE_OS
@@ -137,18 +137,18 @@ TAO_Dynamic_TP_Task::open()//void* args)
   // now. When they startup they will decrement themselves
   // as they go into a wait state.
 
-  this->busy_threads_ = 0; 
+  this->busy_threads_ = 0;
 
   if (TAO_debug_level > 4)
   {
     ACE_DEBUG((LM_DEBUG,
-        ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::open() initialized with:\n")
-        ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::open() init_threads_ \t\t: [%d]\n")
-        ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::open() min_pool_threads_ \t\t: [%d]\n")
-        ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::open() max_pool_threads_ \t\t: [%d]\n")
-        ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::open() max_request_queue_depth_ \t: [%d]\n")
-        ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::open() thread_stack_size_ \t\t: [%d]\n")
-        ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::open() thread_idle_time_ \t\t: [%d]\n"),
+        ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() initialized with:\n")
+        ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() init_threads_ \t\t: [%d]\n")
+        ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() min_pool_threads_ \t\t: [%d]\n")
+        ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() max_pool_threads_ \t\t: [%d]\n")
+        ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() max_request_queue_depth_ \t: [%d]\n")
+        ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() thread_stack_size_ \t\t: [%d]\n")
+        ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() thread_idle_time_ \t\t: [%d]\n"),
         this->init_pool_threads_,
         this->min_pool_threads_,
         this->max_pool_threads_,
@@ -162,7 +162,7 @@ TAO_Dynamic_TP_Task::open()//void* args)
   if (num < 1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) Dynamic_TP_Task::open() failed to open.  ")
+                         ACE_TEXT ("TAO (%P|%t) DTP_Task::open() failed to open.  ")
                          ACE_TEXT ("num_threads (%u) is less-than 1.\n"),
                          num),
                         -1);
@@ -177,7 +177,7 @@ TAO_Dynamic_TP_Task::open()//void* args)
     {
       //FUZZ: disable check_for_lack_ACE_OS
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) Dynamic_TP_Task::open() failed to open.  ")
+                         ACE_TEXT ("TAO (%P|%t) DTP_Task::open() failed to open.  ")
                          ACE_TEXT ("Task has previously been open()'ed.\n")),
                         -1);
       //FUZZ: enable check_for_lack_ACE_OS
@@ -190,7 +190,7 @@ TAO_Dynamic_TP_Task::open()//void* args)
       if (this->activate(THR_NEW_LWP | THR_DETACHED, num, 1) != 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("(%P|%t) Dynamic_TP_Task::open() failed to activate ")
+                             ACE_TEXT ("(%P|%t) DTP_Task::open() failed to activate ")
                              ACE_TEXT ("(%d) worker threads.\n"),
                              num),
                             -1);
@@ -215,7 +215,7 @@ TAO_Dynamic_TP_Task::open()//void* args)
                          stack_sz_arr) != 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("(%P|%t) Dynamic_TP_Task::open() failed to activate ")
+                             ACE_TEXT ("(%P|%t) DTP_Task::open() failed to activate ")
                              ACE_TEXT ("(%d) worker threads.\n"),
                              num),
                             -1);
@@ -230,7 +230,7 @@ TAO_Dynamic_TP_Task::open()//void* args)
 }
 
 bool
-TAO_Dynamic_TP_Task::request_ready (TAO::CSD::TP_Dispatchable_Visitor &v,
+TAO_DTP_Task::request_ready (TAO::CSD::TP_Dispatchable_Visitor &v,
                                     TAO::CSD::TP_Request_Handle &r)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->queue_lock_, false);
@@ -244,7 +244,7 @@ TAO_Dynamic_TP_Task::request_ready (TAO::CSD::TP_Dispatchable_Visitor &v,
 }
 
 void
-TAO_Dynamic_TP_Task::clear_request (TAO::CSD::TP_Request_Handle &r)
+TAO_DTP_Task::clear_request (TAO::CSD::TP_Request_Handle &r)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->queue_lock_);
   --this->num_queue_requests_;
@@ -256,7 +256,7 @@ TAO_Dynamic_TP_Task::clear_request (TAO::CSD::TP_Request_Handle &r)
   if (TAO_debug_level > 4 )
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::svc() ")
+                  ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ")
                   ACE_TEXT ("Decrementing num_queue_requests.")
                   ACE_TEXT ("New queue depth:%d\n"),
                   this->num_queue_requests_));
@@ -266,13 +266,13 @@ TAO_Dynamic_TP_Task::clear_request (TAO::CSD::TP_Request_Handle &r)
 }
 
 int
-TAO_Dynamic_TP_Task::svc()
+TAO_DTP_Task::svc()
 {
   ++this->busy_threads_;
   if (TAO_debug_level > 4)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::svc() ")
+                  ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ")
                   ACE_TEXT ("New thread created.\n")));
     }
 
@@ -290,7 +290,7 @@ TAO_Dynamic_TP_Task::svc()
               if (TAO_debug_level > 4)
                 {
                   ACE_DEBUG ((LM_DEBUG,
-                              ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::svc() ")
+                              ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ")
                               ACE_TEXT ("Decrementing busy_threads_. ")
                               ACE_TEXT ("Busy thread count:%d\n"),
                               this->busy_threads_.value()));
@@ -300,7 +300,7 @@ TAO_Dynamic_TP_Task::svc()
 
               {
                 ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->work_lock_, false);
-                int wait_state = this->thread_idle_time_.sec() == 0 
+                int wait_state = this->thread_idle_time_.sec() == 0
                                  ? this->work_available_.wait()
                                  : this->work_available_.wait(&tmp_sec);
 
@@ -316,7 +316,7 @@ TAO_Dynamic_TP_Task::svc()
                         if (TAO_debug_level > 4)
                           {
                             ACE_DEBUG ((LM_DEBUG,
-                                        ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::svc() ")
+                                        ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ")
                                         ACE_TEXT ("Existing thread expiring.\n")));
                           }
                         return 0;
@@ -328,7 +328,7 @@ TAO_Dynamic_TP_Task::svc()
               if (TAO_debug_level > 4)
                 {
                   ACE_DEBUG ((LM_DEBUG,
-                              ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::svc() ")
+                              ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ")
                               ACE_TEXT ("Incrementing busy_threads_. ")
                               ACE_TEXT ("Busy thread count:%d\n"),
                               this->busy_threads_.value()));
@@ -353,15 +353,15 @@ TAO_Dynamic_TP_Task::svc()
                              &this->thread_stack_size_) != 0)
             {
               ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("(%P|%t) Dynamic_TP_Task::svc() failed to grow ")
+                          ACE_TEXT ("(%P|%t) DTP_Task::svc() failed to grow ")
                           ACE_TEXT ("to %d worker threads.\n"), count));
             }
           else
           {
              if (TAO_debug_level > 4)
-               {  
+               {
                  ACE_DEBUG ((LM_DEBUG,
-                 ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::svc() ")
+                 ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ")
                  ACE_TEXT ("Growing threadcount. ")
                  ACE_TEXT ("New thread count:%d\n"),
                  this->thr_count()));
@@ -378,7 +378,7 @@ TAO_Dynamic_TP_Task::svc()
 
 
 int
-TAO_Dynamic_TP_Task::close(u_long flag)
+TAO_DTP_Task::close(u_long flag)
 {
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->aw_lock_, 0);
@@ -406,7 +406,7 @@ TAO_Dynamic_TP_Task::close(u_long flag)
   if (TAO_debug_level > 4)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Dynamic_TP_Task::close() ")
+                  ACE_TEXT ("TAO (%P|%t) - DTP_Task::close() ")
                   ACE_TEXT ("shutting down. in_task = %d,  Count = %d \n"),
                   in_task,  this->thr_count()));
     }
@@ -426,44 +426,44 @@ TAO_Dynamic_TP_Task::close(u_long flag)
 }
 
 
-void 
-TAO_Dynamic_TP_Task::set_init_pool_threads(size_t thr_count)
+void
+TAO_DTP_Task::set_init_pool_threads(size_t thr_count)
 {
   this->init_pool_threads_ = thr_count;
 }
 
-void 
-TAO_Dynamic_TP_Task::set_min_pool_threads(size_t thr_count)
+void
+TAO_DTP_Task::set_min_pool_threads(size_t thr_count)
 {
   this->min_pool_threads_ = thr_count;
 }
 
 void
-TAO_Dynamic_TP_Task::set_max_pool_threads(size_t thr_count)
+TAO_DTP_Task::set_max_pool_threads(size_t thr_count)
 {
   this->max_pool_threads_ = thr_count;
 }
 
 void
-TAO_Dynamic_TP_Task::set_thread_stack_size(size_t stack_sz)
+TAO_DTP_Task::set_thread_stack_size(size_t stack_sz)
 {
   this->thread_stack_size_ = stack_sz;
 }
 
 void
-TAO_Dynamic_TP_Task::set_thread_idle_time(ACE_Time_Value thr_timeout)
+TAO_DTP_Task::set_thread_idle_time(ACE_Time_Value thr_timeout)
 {
   this->thread_idle_time_ = thr_timeout;
 }
 
 void
-TAO_Dynamic_TP_Task::set_max_request_queue_depth(size_t queue_depth)
+TAO_DTP_Task::set_max_request_queue_depth(size_t queue_depth)
 {
   this->max_request_queue_depth_ = queue_depth;
 }
 
 void
-TAO_Dynamic_TP_Task::cancel_servant (PortableServer::Servant servant)
+TAO_DTP_Task::cancel_servant (PortableServer::Servant servant)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->queue_lock_);
 
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_Task.h b/TAO/tao/Dynamic_TP/DTP_Task.h
index 6476eb9aa3e..0b18950e75d 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_Task.h
+++ b/TAO/tao/Dynamic_TP/DTP_Task.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file    Dynamic_TP_Task.h
+ *  @file    DTP_Task.h
  *
  *  $Id$
  */
@@ -14,7 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/Dynamic_TP/dynamic_tp_export.h"
-#include "tao/Dynamic_TP/Dynamic_TP_Config.h"
+#include "tao/Dynamic_TP/DTP_Config.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Queue.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Request.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h"
@@ -56,15 +56,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
      * worker thread will invoke this task's close() method (with the
      * flag argument equal to 0).
      */
-    class TAO_Dynamic_TP_Export TAO_Dynamic_TP_Task : public ACE_Task_Base
+    class TAO_Dynamic_TP_Export TAO_DTP_Task : public ACE_Task_Base
     {
     public:
 
       /// Default Constructor.
-      TAO_Dynamic_TP_Task();
+      TAO_DTP_Task();
 
       /// Virtual Destructor.
-      virtual ~TAO_Dynamic_TP_Task();
+      virtual ~TAO_DTP_Task();
 
       struct Open_Args {
         TAO_DTP_Definition task_thread_config;
@@ -76,7 +76,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
       bool add_request(TAO::CSD::TP_Request* request);
 
       /// Activate the worker threads
-      virtual int open();//void* args = 0);
+      virtual int open(void* args = 0);
 
       /// The "mainline" executed by each worker thread.
       virtual int svc();
@@ -191,7 +191,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "tao/Dynamic_TP/Dynamic_TP_Task.inl"
+# include "tao/Dynamic_TP/DTP_Task.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP_Task.inl b/TAO/tao/Dynamic_TP/DTP_Task.inl
index 5b9eaafbd7d..5b9eaafbd7d 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP_Task.inl
+++ b/TAO/tao/Dynamic_TP/DTP_Task.inl
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
index 72d4aa9a277..b51541bb745 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
@@ -27,7 +27,7 @@
 #include "ace/Hash_Map_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Dynamic_TP/dynamic_tp_export.h"
-#include "tao/Dynamic_TP/Dynamic_TP_Config.h"
+#include "tao/Dynamic_TP/DTP_Config.h"
 #include "tao/New_Leader_Generator.h"
 #include "ace/Task.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/tests/Dynamic_TP/Config_Loader/Test.cpp b/TAO/tests/Dynamic_TP/Config_Loader/Test.cpp
index dcce5806a08..f6d274e8080 100644
--- a/TAO/tests/Dynamic_TP/Config_Loader/Test.cpp
+++ b/TAO/tests/Dynamic_TP/Config_Loader/Test.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Dynamic_TP/Dynamic_TP_Config.h"
+#include "tao/Dynamic_TP/DTP_Config.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Service_Config.h"
 #include "ace/Dynamic_Service.h"
@@ -24,9 +24,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   ACE_Service_Config::open (argc, argv);
 
   ACE_Service_Gestalt *current = ACE_Service_Config::current();
-  TAO_Dynamic_TP_Config_Registry* registry =
-    ACE_Dynamic_Service<TAO_Dynamic_TP_Config_Registry>::instance
-    (current, "Dynamic_TP_Config_Registry", true);
+  TAO_DTP_Config_Registry* registry =
+    ACE_Dynamic_Service<TAO_DTP_Config_Registry>::instance
+    (current, "DTP_Config_Registry", true);
 
   if (registry == 0)
     {
diff --git a/TAO/tests/Dynamic_TP/Config_Loader/svc.conf b/TAO/tests/Dynamic_TP/Config_Loader/svc.conf
index 10417277b38..4b3231a7a8b 100644
--- a/TAO/tests/Dynamic_TP/Config_Loader/svc.conf
+++ b/TAO/tests/Dynamic_TP/Config_Loader/svc.conf
@@ -1,16 +1,16 @@
 # $Id$
 
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config()
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config()
         "-DTPName ORB -DTPMin 5 -DTPInit 6 -DTPMax 10 -DTPTimeout 240 -DTPStack 10240 -DTPQueue 20"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName POA1 -DTPMin 2 -DTPInit 4 -DTPMax 10 -DTPQueue 10"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName POA1 -DTPOverwrite 1 -DTPMin 7 -DTPMax 14 "
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName POA1 -DTPMin 7 -DTPMax 11 -DPQueue 14"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName defaults"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m1 -DTPMin 3"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m2 -DTPMax 10"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m3 -DTPTimeout 120"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m4 -DTPMin 3 -DTPInit 7 -DTPMax 10 -DTPTimeout 120"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m5 -DTPMin 3 -DTPInit 10 -DTPTimeout 30"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m6 -DTPInit 6 -DTPMax -1"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m7 -DTPInit 7"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName bogus -DTPMin 6 -DTPInit 3"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName POA1 -DTPMin 2 -DTPInit 4 -DTPMax 10 -DTPQueue 10"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName POA1 -DTPOverwrite 1 -DTPMin 7 -DTPMax 14 "
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName POA1 -DTPMin 7 -DTPMax 11 -DPQueue 14"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName defaults"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m1 -DTPMin 3"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m2 -DTPMax 10"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m3 -DTPTimeout 120"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m4 -DTPMin 3 -DTPInit 7 -DTPMax 10 -DTPTimeout 120"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m5 -DTPMin 3 -DTPInit 10 -DTPTimeout 30"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m6 -DTPInit 6 -DTPMax -1"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m7 -DTPInit 7"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName bogus -DTPMin 6 -DTPInit 3"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl
index 74936e686f1..ff8141814bb 100755
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl
@@ -37,7 +37,7 @@ sub test_1
     my $iorbase = shift;
     my $deletelogs = shift;
     my $status = 0;
-    
+
     print "\nRunning Test 1....\n";
     $test_num=1;
 
@@ -74,7 +74,7 @@ sub test_1
 
      # Now find the spawned threads in the log file.
 
-    $find_this="Dynamic_TP_Task::svc() New thread created.";
+    $find_this="DTP_Task::svc() New thread created.";
     $found_cnt=0;
 
     my($found_cnt) = count_strings($server_logfile,$find_this);
@@ -115,8 +115,8 @@ sub test_2
     my $iorbase = shift;
     my $deletelogs = shift;
     my $status = 0;
-    
-    
+
+
     print "\nRunning Test 2....\n";
     $test_num=2;
     my $lfname = "server_test" . $test_num . ".log";
@@ -155,7 +155,7 @@ sub test_2
     }
      # Now find the spawned threads in the log file.
 
-    $find_this="Dynamic_TP_Task::svc() Existing thread expiring.";
+    $find_this="DTP_Task::svc() Existing thread expiring.";
     $found_cnt=0;
 
     my($found_cnt) = count_strings($server_logfile,$find_this);
@@ -174,10 +174,10 @@ sub test_2
         print STDERR "ERROR: server returned $server_status\n";
         $status = 1;
     }
-    
+
     $server->DeleteFile($iorbase);
     $client->DeleteFile($iorbase);
-       
+
     return($status);
 }
 
@@ -195,7 +195,7 @@ sub test_3
     my $iorbase = shift;
     my $deletelogs = shift;
     my $status = 0;
-    
+
     print "\nRunning Test 3....\n";
     $test_num=3;
     $num_clients=15;
@@ -267,7 +267,7 @@ sub test_3
 
     $server->DeleteFile($iorbase);
     $client->DeleteFile($iorbase);
-    
+
     return($status);
 }
 
@@ -281,7 +281,7 @@ sub test_4
     # will issue calls from 10 clients. There should be 5 CORBA exceptions found
     # in the log after the run.
     #
-    
+
     my $server = shift;
     my $client = shift;
     my $iorbase = shift;
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
index 8de18ed608e..fcdfee2efe0 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Hello.h"
-#include "tao/Dynamic_TP/Dynamic_TP_POA_Strategy.h"
+#include "tao/Dynamic_TP/DTP_POA_Strategy.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Thread_Manager.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc1.conf b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc1.conf
index b7e33603656..98c7ce1492f 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc1.conf
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc1.conf
@@ -1,4 +1,4 @@
 # $Id$
 
-dynamic Dynamic_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName POA1 -DTPMin -1 -DTPInit 5 -DTPMax -1 -DTPTimeout 60 -DTPStack 0 -DTPQueue 0"
-dynamic Dynamic_TP_POA_Loader Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_POA_Loader() "-DTPPOAConfigMap RootPOA,MyPOA2,MyPOA3:POA1"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName POA1 -DTPMin -1 -DTPInit 5 -DTPMax -1 -DTPTimeout 60 -DTPStack 0 -DTPQueue 0"
+dynamic DTP_POA_Loader Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_POA_Loader() "-DTPPOAConfigMap RootPOA,MyPOA2,MyPOA3:POA1"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc2.conf b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc2.conf
index 934c07da21c..a0c90c7be1d 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc2.conf
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc2.conf
@@ -1,4 +1,4 @@
 # $Id$
 
-dynamic Dynamic_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName POA1 -DTPMin 5 -DTPInit 10 -DTPMax -1 -DTPTimeout 10 -DTPStack 0 -DTPQueue 0"
-dynamic Dynamic_TP_POA_Loader Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_POA_Loader() "-DTPPOAConfigMap RootPOA,MyPOA2,MyPOA3:POA1"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName POA1 -DTPMin 5 -DTPInit 10 -DTPMax -1 -DTPTimeout 10 -DTPStack 0 -DTPQueue 0"
+dynamic DTP_POA_Loader Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_POA_Loader() "-DTPPOAConfigMap RootPOA,MyPOA2,MyPOA3:POA1"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc3.conf b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc3.conf
index 7d2143ce252..1e56b9c2599 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc3.conf
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc3.conf
@@ -1,4 +1,4 @@
 # $Id$
 
-dynamic Dynamic_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName POA1 -DTPMin -1 -DTPInit 15 -DTPMax -1 -DTPTimeout 10 -DTPStack 0 -DTPQueue 10"
-dynamic Dynamic_TP_POA_Loader Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_POA_Loader() "-DTPPOAConfigMap RootPOA,MyPOA2,MyPOA3:POA1"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName POA1 -DTPMin -1 -DTPInit 15 -DTPMax -1 -DTPTimeout 10 -DTPStack 0 -DTPQueue 10"
+dynamic DTP_POA_Loader Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_POA_Loader() "-DTPPOAConfigMap RootPOA,MyPOA2,MyPOA3:POA1"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc4.conf b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc4.conf
index 9daef8d1c41..7b8f2807899 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc4.conf
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/svc4.conf
@@ -1,4 +1,4 @@
 # $Id$
 
-dynamic Dynamic_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName POA1 -DTPMin -1 -DTPInit 1 -DTPMax 5 -DTPTimeout 60 -DTPStack 0 -DTPQueue 10"
-dynamic Dynamic_TP_POA_Loader Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_POA_Loader() "-DTPPOAConfigMap RootPOA,MyPOA2,MyPOA3:POA1"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName POA1 -DTPMin -1 -DTPInit 1 -DTPMax 5 -DTPTimeout 60 -DTPStack 0 -DTPQueue 10"
+dynamic DTP_POA_Loader Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_POA_Loader() "-DTPPOAConfigMap RootPOA,MyPOA2,MyPOA3:POA1"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl
index 062fc791234..bc66e52623f 100755
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl
@@ -37,7 +37,7 @@ sub test_1
     my $iorbase = shift;
     my $deletelogs = shift;
     my $status = 0;
-    
+
     print "\nRunning Test 1....\n";
     $test_num=1;
 
@@ -74,7 +74,7 @@ sub test_1
 
      # Now find the spawned threads in the log file.
 
-    $find_this="Dynamic_TP_Task::svc() New thread created.";
+    $find_this="DTP_Task::svc() New thread created.";
     $found_cnt=0;
 
     my($found_cnt) = count_strings($server_logfile,$find_this);
@@ -115,8 +115,8 @@ sub test_2
     my $iorbase = shift;
     my $deletelogs = shift;
     my $status = 0;
-    
-    
+
+
     print "\nRunning Test 2....\n";
     $test_num=2;
     my $lfname = "server_test" . $test_num . ".log";
@@ -155,7 +155,7 @@ sub test_2
     }
      # Now find the spawned threads in the log file.
 
-    $find_this="Dynamic_TP_Task::svc() Existing thread expiring.";
+    $find_this="DTP_Task::svc() Existing thread expiring.";
     $found_cnt=0;
 
     my($found_cnt) = count_strings($server_logfile,$find_this);
@@ -174,10 +174,10 @@ sub test_2
         print STDERR "ERROR: server returned $server_status\n";
         $status = 1;
     }
-    
+
     $server->DeleteFile($iorbase);
     $client->DeleteFile($iorbase);
-       
+
     return($status);
 }
 
@@ -195,7 +195,7 @@ sub test_3
     my $iorbase = shift;
     my $deletelogs = shift;
     my $status = 0;
-    
+
     print "\nRunning Test 3....\n";
     $test_num=3;
     $num_clients=15;
@@ -267,7 +267,7 @@ sub test_3
 
     $server->DeleteFile($iorbase);
     $client->DeleteFile($iorbase);
-    
+
     return($status);
 }
 
@@ -281,7 +281,7 @@ sub test_4
     # will issue calls from 10 clients. There should be 5 CORBA exceptions found
     # in the log after the run.
     #
-    
+
     my $server = shift;
     my $client = shift;
     my $iorbase = shift;
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
index 42a8ba9c6a7..0e6b309f82b 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Hello.h"
-#include "tao/Dynamic_TP/Dynamic_TP_POA_Strategy.h"
+#include "tao/Dynamic_TP/DTP_POA_Strategy.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Thread_Manager.h"
@@ -126,8 +126,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   // Create the thread pool servant dispatching strategy object, and
   // hold it in a (local) smart pointer variable.
-  TAO_Intrusive_Ref_Count_Handle<TAO_Dynamic_TP_POA_Strategy> csd_strategy =
-                                                 new TAO_Dynamic_TP_POA_Strategy(&dtp_config, false);
+  TAO_Intrusive_Ref_Count_Handle<TAO_DTP_POA_Strategy> csd_strategy =
+    new TAO_DTP_POA_Strategy(&dtp_config, false);
 
   // Tell the strategy to apply itself to the child poa.
     if (csd_strategy->apply_to(root_poa.in()) == false)
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Test.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Test.cpp
index ed119d30cea..538f19b126e 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Test.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Test.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Dynamic_TP/Dynamic_TP_POA_Strategy.h"
+#include "tao/Dynamic_TP/DTP_POA_Strategy.h"
 #include "tao/CSD_Framework/CSD_Strategy_Repository.h"
 
 #include "ace/OS_NS_stdio.h"
@@ -23,7 +23,7 @@ show_tp_config (const ACE_CString &name, const TAO_DTP_Definition &entry)
 }
 
 //void
-//show_poa_config (const ACE_CString &name, TAO_Dynamic_TP_POA_Strategy * strat)
+//show_poa_config (const ACE_CString &name, TAO_DTP_POA_Strategy * strat)
 //{
   //ACE_DEBUG ((LM_INFO, ACE_TEXT ("POA [%C] has the configuration key [%C]\n"), name.c_str(),strat->get_tp_config().c_str()));
   //ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("  Initial threads: %d:\n"), entry.init_threads_));
@@ -68,19 +68,19 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       0
     };
 
-  TAO_Dynamic_TP_POA_Strategy * mapped_strategy;
+  TAO_DTP_POA_Strategy * mapped_strategy;
 
   for (int i = 0; poa_list[i] != 0; i++)
     {
       mapped_strategy = 0;
       ACE_DEBUG ((LM_INFO, ACE_TEXT("Config definition for %C\n"), poa_list[i]));
-      mapped_strategy = dynamic_cast <TAO_Dynamic_TP_POA_Strategy*> (dtp_poa_strat_repo->find (poa_list[i]));
-      if ((mapped_strategy == 0) && (i != 1))
+      mapped_strategy = dynamic_cast <TAO_DTP_POA_Strategy*> (dtp_poa_strat_repo->find (poa_list[i]));
+      if ((mapped_strategy == 0) && (i != 1) && (i != 3))
         {
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Cannot find TP Config definition for %C\n"), poa_list[i]));
           continue;
         }
-      if (i == 1)
+      if (i == 1 || i == 3)
         {
           if (mapped_strategy)
             {
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/svc.conf b/TAO/tests/Dynamic_TP/POA_Loader/svc.conf
index 750b31c3b0d..664f8220087 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/svc.conf
+++ b/TAO/tests/Dynamic_TP/POA_Loader/svc.conf
@@ -1,15 +1,15 @@
 # $Id$
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName ORB -DTPMin 5 -DTPInit 6 -DTPMax 10 -DTPTimeout 240 -DTPStack 10240 -DTPQueue 20"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName POA1 -DTPMin 2 -DTPInit 4 -DTPMax 10 -DTPQueue 10"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName POA1 -DTPOverwrite 1 -DTPMin 7 -DTPMax 14 "
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName POA1 -DTPMin 7 -DTPMax 11 -DPQueue 14"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName defaults"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m1 -DTPMin 3"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m2 -DTPMax 10"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m3 -DTPTimeout 120"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m4 -DTPMin 3 -DTPInit 7 -DTPMax 10 -DTPTimeout 120"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m5 -DTPMin 3 -DTPInit 10 -DTPTimeout 30"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m6 -DTPInit 6 -DTPMax -1"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName m7 -DTPInit 7"
-dynamic Dynamice_TP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_Config() "-DTPName bogus -DTPMin 6 -DTPInit 3"
-dynamic Dynamic_TP_POA_Loader Service_Object * TAO_Dynamic_TP:_make_TAO_Dynamic_TP_POA_Loader() "-DTPPOAConfigMap MyPOA,MyPOA2,MyPOA3:POA1"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName ORB -DTPMin 5 -DTPInit 6 -DTPMax 10 -DTPTimeout 240 -DTPStack 10240 -DTPQueue 20"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName POA1 -DTPMin 2 -DTPInit 4 -DTPMax 10 -DTPQueue 10"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName POA1 -DTPOverwrite 1 -DTPMin 7 -DTPMax 14 "
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName POA1 -DTPMin 7 -DTPMax 11 -DPQueue 14"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName defaults"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m1 -DTPMin 3"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m2 -DTPMax 10"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m3 -DTPTimeout 120"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m4 -DTPMin 3 -DTPInit 7 -DTPMax 10 -DTPTimeout 120"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m5 -DTPMin 3 -DTPInit 10 -DTPTimeout 30"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m6 -DTPInit 6 -DTPMax -1"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName m7 -DTPInit 7"
+dynamic DTP_Config Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_Config() "-DTPName bogus -DTPMin 6 -DTPInit 3"
+dynamic DTP_POA_Loader Service_Object * TAO_Dynamic_TP:_make_TAO_DTP_POA_Loader() "-DTPPOAConfigMap MyPOA,MyPOA2,MyPOA3:POA1"