ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>

35 files changed, 754 insertions, 754 deletions

diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index 13ad05417f5..badd76f3043 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -41,22 +41,22 @@ parse_args (int argc, char *argv[])
 
 CORBA::Short
 get_server_priority (Test_ptr server
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   // Get the Priority Model Policy from the stub.
   CORBA::Policy_var policy =
     server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Narrow down to correct type.
   RTCORBA::PriorityModelPolicy_var priority_policy =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER);
+    RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Make sure that we have the SERVER_DECLARED priority model.
   RTCORBA::PriorityModel priority_model =
-    priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+    priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (priority_model != RTCORBA::SERVER_DECLARED)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -65,20 +65,20 @@ get_server_priority (Test_ptr server
                       -1);
 
   // Return the server priority.
-  return priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 invocation_exception_test (Test_ptr obj,
                            CORBA::Short priority
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       // Invoke method on test object.
       obj->test_method (1,
                         priority
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This next line of code should not run because an exception
@@ -115,7 +115,7 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -128,42 +128,42 @@ main (int argc, char *argv[])
       // Get the RTORB.
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the RTCurrent.
       object =
         orb->resolve_initial_references ("RTCurrent"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test object 1 (with CLIENT_PROPAGATED priority model).
       object =
         orb->string_to_object (ior1
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var client_propagated_obj =
-        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test object 2 (with SERVER_DECLARED priority model).
       object = orb->string_to_object (ior2
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server_declared_obj =
-        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test: Attempt to set priority bands that do not match server
@@ -183,7 +183,7 @@ main (int argc, char *argv[])
       policies.length (1);
       policies[0] =
         rt_orb->create_priority_banded_connection_policy (false_bands
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set false bands at the object level.  Note that a new object
@@ -191,24 +191,24 @@ main (int argc, char *argv[])
       object =
         client_propagated_obj->_set_policy_overrides (policies,
                                                       CORBA::SET_OVERRIDE
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       client_propagated_obj =
-        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Invoking on this object with false bands should produce an
       // exception.
       invocation_exception_test (client_propagated_obj.in (),
                                  0
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the correct bands from the <server_declared_obj>.
       policies[0] =
         server_declared_obj->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityBandedConnectionPolicy_var bands_policy =
@@ -222,12 +222,12 @@ main (int argc, char *argv[])
       object =
         client_propagated_obj->_set_policy_overrides (policies,
                                                       CORBA::SET_OVERRIDE
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Overwrite existing <client_propagated_obj>.
       client_propagated_obj =
-        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test: Attempt invocation on <client_propagated_obj> with
@@ -243,14 +243,14 @@ main (int argc, char *argv[])
 
       // Reset the current thread's priority.
       current->the_priority (client_priority
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Invoking on this object with an invalid client thread
       // priority should produce an exception.
       invocation_exception_test (client_propagated_obj.in (),
                                  client_priority
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test: Make invocations on the <client_propagated_obj>.
@@ -268,13 +268,13 @@ main (int argc, char *argv[])
 
           // Reset the current thread's priority.
           current->the_priority (client_priority
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Invoke test method on server.
           client_propagated_obj->test_method (1, // CLIENT_PROPAGATED
                                               client_priority
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -286,17 +286,17 @@ main (int argc, char *argv[])
       // Get the <server_priority> from the stub.
       CORBA::Short server_priority =
         get_server_priority (server_declared_obj.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Invoke test method on server.
       server_declared_obj->test_method (0, // SERVER_DECLARED
                                         server_priority
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Testing over. Shut down Server ORB.
-      server_declared_obj->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server_declared_obj->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index c2b2660d8fc..ea801e29409 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -12,14 +12,14 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb,
           RTCORBA::PriorityBands &bands
-          TAO_ENV_ARG_DECL);
+          ACE_ENV_ARG_DECL);
 
   void test_method (CORBA::Boolean client_propagated,
                     CORBA::Short priority
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -30,7 +30,7 @@ private:
 
 Test_i::Test_i (CORBA::ORB_ptr orb,
                 RTCORBA::PriorityBands &bands
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
      bands_ (bands),
      rt_current_ ()
@@ -38,24 +38,24 @@ Test_i::Test_i (CORBA::ORB_ptr orb,
   // We resolve and store the RT Current for later use.
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("RTCurrent"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->rt_current_ =
     RTCORBA::Current::_narrow (obj.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Test_i::test_method (CORBA::Boolean client_propagated,
                      CORBA::Short client_priority
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the upcall thread's priority.
   CORBA::Short server_priority =
-    this->rt_current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->rt_current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Check which policy we are dealing with.
@@ -116,11 +116,11 @@ Test_i::test_method (CORBA::Boolean client_propagated,
 }
 
 void
-Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -233,24 +233,24 @@ create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
                const char *filename
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   // Register servant with the POA.
   PortableServer::ObjectId_var id;
   id = poa->activate_object (server_impl
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create object reference.
   CORBA::Object_var server =
     poa->id_to_reference (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
     orb->object_to_string (server.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Print ior to the file.
@@ -276,7 +276,7 @@ void
 object_activation_exception_test (RTPortableServer::POA_ptr poa,
                                   Test_i *server_impl,
                                   CORBA::Short priority
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -284,7 +284,7 @@ object_activation_exception_test (RTPortableServer::POA_ptr poa,
       PortableServer::ObjectId_var id =
         poa->activate_object_with_priority (server_impl,
                                             priority
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This next line of code should not run because an exception
@@ -311,7 +311,7 @@ void
 poa_creation_exception_test (PortableServer::POA_ptr root_poa,
                              PortableServer::POAManager_ptr manager,
                              CORBA::PolicyList &policies
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -320,7 +320,7 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa,
         root_poa->create_POA ("Child_POA",
                               manager,
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This next line of code should not run because an exception
@@ -357,7 +357,7 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -370,27 +370,27 @@ main (int argc, char *argv[])
       // Get the RTORB.
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the RootPOA.
       object =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA Manager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain priority bands to be used in this test from the file
@@ -436,7 +436,7 @@ main (int argc, char *argv[])
                                               allow_request_buffering,
                                               max_buffered_requests,
                                               max_request_buffer_size
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test: Attempt to create a POA with priority bands that do not
@@ -455,13 +455,13 @@ main (int argc, char *argv[])
       // Create a bands policy.
       poa_policy_list[0] =
         rt_orb->create_priority_banded_connection_policy (false_bands
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a thread-pool policy.
       poa_policy_list[1] =
         rt_orb->create_threadpool_policy (threadpool_id
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to create a POA with invalid policies.  Should throw an
@@ -469,7 +469,7 @@ main (int argc, char *argv[])
       poa_creation_exception_test (root_poa.in (),
                                    poa_manager.in (),
                                    poa_policy_list
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Two policies for the next POA.
@@ -479,13 +479,13 @@ main (int argc, char *argv[])
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                               0
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a thread-pool policy.
       poa_policy_list[1] =
         rt_orb->create_threadpool_policy (threadpool_id
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA with CLIENT_PROPAGATED priority model, with lanes
@@ -494,7 +494,7 @@ main (int argc, char *argv[])
         root_poa->create_POA ("client_propagated_poa",
                               poa_manager.in (),
                               poa_policy_list
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Three policies for the next POA.
@@ -508,19 +508,19 @@ main (int argc, char *argv[])
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
                                               poa_priority
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a bands policy.
       poa_policy_list[1] =
         rt_orb->create_priority_banded_connection_policy (bands
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a thread-pool policy.
       poa_policy_list[2] =
         rt_orb->create_threadpool_policy (threadpool_id
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA with SERVER_DECLARED priority model, with bands
@@ -529,7 +529,7 @@ main (int argc, char *argv[])
         root_poa->create_POA ("server_declared_poa",
                               poa_manager.in (),
                               poa_policy_list
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test: Attempt to register an object with priority that
@@ -538,7 +538,7 @@ main (int argc, char *argv[])
                   "\n<---Test--->: Servant priority does not match lanes\n\n"));
 
       RTPortableServer::POA_var rt_server_declared_poa =
-        RTPortableServer::POA::_narrow (server_declared_poa.in () TAO_ENV_ARG_PARAMETER);
+        RTPortableServer::POA::_narrow (server_declared_poa.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activation with incorrect priority should fail.
@@ -546,19 +546,19 @@ main (int argc, char *argv[])
       object_activation_exception_test (rt_server_declared_poa.in (),
                                         0,
                                         wrong_priority
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create first servant and register with <client_propagated_poa>.
       Test_i server_impl (orb.in (),
                           bands
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       result = create_object (client_propagated_poa.in (),
                               orb.in (),
                               &server_impl,
                               ior_output_file1
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
@@ -566,27 +566,27 @@ main (int argc, char *argv[])
       // Create second servant and register with <server_declared_poa>.
       Test_i server_impl2 (orb.in (),
                            bands
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       result = create_object (server_declared_poa.in (),
                               orb.in (),
                               &server_impl2,
                               ior_output_file2
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
       // Activate POA manager.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run ORB.
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy ORB.
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
index 5a57d02a41b..d57bc36ba7f 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
@@ -15,7 +15,7 @@ Client_ORBInitializer::Client_ORBInitializer (void)
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -23,12 +23,12 @@ Client_ORBInitializer::pre_init (
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var orb_id =
-    info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
@@ -44,7 +44,7 @@ Client_ORBInitializer::post_init (
     client_interceptor = interceptor;
 
   info->add_client_request_interceptor (client_interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
index 4f0a2b8b6bd..855d3ace6e9 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
@@ -35,11 +35,11 @@ public:
   Client_ORBInitializer (void);
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index 28c586f5857..9d893ebf504 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -54,23 +54,23 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server =
-        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -85,11 +85,11 @@ main (int argc, char *argv[])
       // PriorityModelPolicy.
       CORBA::Policy_var policy =
         server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityModelPolicy_var priority_policy =
-        RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER);
+        RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (priority_policy.in ()))
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
                           1);
 
       RTCORBA::PriorityModel priority_model =
-        priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+        priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (priority_model != RTCORBA::CLIENT_PROPAGATED)
@@ -110,18 +110,18 @@ main (int argc, char *argv[])
       // Make several invocation, changing the priority of this thread
       // for each.
       object =
-        orb->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object = orb->resolve_initial_references ("PriorityMappingManager"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::PriorityMappingManager_var mapping_manager =
         RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMapping *pm =
@@ -145,11 +145,11 @@ main (int argc, char *argv[])
 
       for (int i = 0; i < 3; ++i)
         {
-          current->the_priority (desired_priority TAO_ENV_ARG_PARAMETER);
+          current->the_priority (desired_priority ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Short priority =
-            current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+            current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (desired_priority != priority)
@@ -159,14 +159,14 @@ main (int argc, char *argv[])
                               1);
 
 
-          server->test_method (priority TAO_ENV_ARG_PARAMETER);
+          server->test_method (priority ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           desired_priority++;
         }
 
       // Shut down Server ORB.
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::DATA_CONVERSION, ex)
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
index a8b90cfe9b2..5f25dd80e4a 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
@@ -33,14 +33,14 @@ Client_Request_Interceptor::_remove_ref (void)
 }
 
 char *
-Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -48,7 +48,7 @@ Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
@@ -57,7 +57,7 @@ Client_Request_Interceptor::send_poll (
 void
 Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -67,7 +67,7 @@ Client_Request_Interceptor::send_request (
 void
 Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -76,7 +76,7 @@ Client_Request_Interceptor::receive_reply (
       // Try to get the RTCorbaPriority context.  If its not there,
       // report the fact via an exception.
       IOP::ServiceContext_var sc =
-        ri->get_reply_service_context (IOP::RTCorbaPriority TAO_ENV_ARG_PARAMETER);
+        ri->get_reply_service_context (IOP::RTCorbaPriority ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -95,7 +95,7 @@ Client_Request_Interceptor::receive_reply (
 void
 Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -104,7 +104,7 @@ Client_Request_Interceptor::receive_other (
 void
 Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -114,18 +114,18 @@ Client_Request_Interceptor::receive_exception (
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
                                     this->orb_id_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var target = ri->target (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (target.in () TAO_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -139,6 +139,6 @@ Client_Request_Interceptor::receive_exception (
   // Try to get the RTCorbaPriority context.  If its not there,
   // report the fact via an exception.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (IOP::RTCorbaPriority TAO_ENV_ARG_PARAMETER);
+    ri->get_reply_service_context (IOP::RTCorbaPriority ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
index 9bd520664ae..3bea78ef097 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
@@ -39,33 +39,33 @@ public:
   virtual void _remove_ref (void);
   // Decrement the reference count.
 
-  virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index 21af1d36fdb..a22a3155703 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -17,10 +17,10 @@ public:
 
   // = The Test methods.
   void test_method (CORBA::Short priority
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -35,25 +35,25 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 void
 Test_i::test_method (CORBA::Short priority
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Use RTCurrent to find out the CORBA priority of the current
   // thread.
 
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+    RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (obj.in ()))
     ACE_THROW (CORBA::INTERNAL ());
 
   CORBA::Short servant_thread_priority =
-    current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+    current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Print out the info.
@@ -69,10 +69,10 @@ Test_i::test_method (CORBA::Short priority
 }
 
 void
-Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -119,18 +119,18 @@ main (int argc, char *argv[])
       // parse arguments and get all the references (ORB,
       // RootPOA, RTORB, RTCurrent, POAManager).
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -139,20 +139,20 @@ main (int argc, char *argv[])
                           -1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      object = orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
+      object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA with CLIENT_PROPAGATED PriorityModelPolicy,
@@ -162,30 +162,30 @@ main (int argc, char *argv[])
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                               0
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
                               poa_policy_list
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        child_poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER);
+        child_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var server =
         child_poa->id_to_reference (id.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print Object IOR.
       CORBA::String_var ior =
-        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ()));
@@ -204,21 +204,21 @@ main (int argc, char *argv[])
 
       // Get the initial priority of the current thread.
       CORBA::Short initial_thread_priority =
-        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run ORB Event loop.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n"));
 
       // Get the final priority of the current thread.
       CORBA::Short final_thread_priority =
-        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (final_thread_priority != initial_thread_priority)
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
index e4375ae41cd..22f26d9a51a 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
@@ -64,11 +64,11 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 void
 exception_test (Test_ptr server,
                 const char *msg
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      server->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
      }
   ACE_CATCH (CORBA::INV_POLICY, ex)
@@ -94,7 +94,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -103,20 +103,20 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
 
       // PolicyManager.
       object = orb->resolve_initial_references ("ORBPolicyManager"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (policy_manager.in (), "PolicyManager")
           == -1)
@@ -124,27 +124,27 @@ main (int argc, char *argv[])
 
       // PolicyCurrent.
       object = orb->resolve_initial_references ("PolicyCurrent"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
         return 1;
 
       // Test object 1 (ClientProtocolPolicy set on server).
-      object = orb->string_to_object (ior1 TAO_ENV_ARG_PARAMETER);
+      object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Test_var server1 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+      Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server1.in (), "server1") == -1)
         return 1;
 
       // Test object 2 (no client-exposed ClientProtocolPolicy).
-      object = orb->string_to_object (ior2 TAO_ENV_ARG_PARAMETER);
+      object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Test_var server2 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+      Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server2.in (), "server2") == -1)
         return 1;
@@ -155,7 +155,7 @@ main (int argc, char *argv[])
       // ClientProtocolPolicy set on the server side.
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Test 1\n"));
-      server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test 2: Set the ORB-level ClientProtocolPolicy override, and
@@ -176,16 +176,16 @@ main (int argc, char *argv[])
       policy_list.length (1);
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_manager->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_test (server1.in (),
-                      "ERROR: Test 2 failed\n" TAO_ENV_ARG_PARAMETER);
+                      "ERROR: Test 2 failed\n" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test 3: Attempt the invocation on the second object reference
@@ -194,7 +194,7 @@ main (int argc, char *argv[])
       // conflicts.
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Test 3\n"));
-      server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test 4: Override ClientProtocolPolicy on the Current level.
@@ -212,16 +212,16 @@ main (int argc, char *argv[])
       protocols[2].protocol_type = 5;
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_test (server2.in (),
-                      "ERROR: Test 4 failed\n" TAO_ENV_ARG_PARAMETER);
+                      "ERROR: Test 4 failed\n" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test 5: Override ClientProtocolPolicy on the Current level
@@ -235,21 +235,21 @@ main (int argc, char *argv[])
       protocols[1].protocol_type = protocol_type;
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Testing over.  Shut down server ORB.
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Testing over\n"));
-      server2->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server2->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index f88ad59a419..e43b62ad6d5 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -16,10 +16,10 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -33,7 +33,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -41,10 +41,10 @@ Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAM
 }
 
 void
-Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -113,21 +113,21 @@ create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
                const char *filename
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   // Register with poa.
   PortableServer::ObjectId_var id =
-    poa->activate_object (server_impl TAO_ENV_ARG_PARAMETER);
+    poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
     poa->id_to_reference (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
+    orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
@@ -155,7 +155,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -164,27 +164,27 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
 
       // RootPOA.
       object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return 1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create child POA with RTCORBA::ClientProtocolPolicy set.
@@ -202,14 +202,14 @@ main (int argc, char *argv[])
       poa_policy_list.length (1);
       poa_policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
                               poa_policy_list
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servant.
@@ -219,7 +219,7 @@ main (int argc, char *argv[])
       int result;
       ACE_DEBUG ((LM_DEBUG, "\nActivated object one as "));
       result = create_object (poa.in (), orb.in (), &server_impl,
-                              ior_output_file1 TAO_ENV_ARG_PARAMETER);
+                              ior_output_file1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
@@ -227,16 +227,16 @@ main (int argc, char *argv[])
       // Create object 2.
       ACE_DEBUG ((LM_DEBUG, "\nActivated object two as "));
       result = create_object (root_poa.in (), orb.in (), &server_impl,
-                              ior_output_file2 TAO_ENV_ARG_PARAMETER);
+                              ior_output_file2 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
 
       // Run ORB Event loop.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index fea2d7d3fd8..b7b3731cf50 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -30,13 +30,13 @@ public:
           PortableServer::POA_ptr poa,
           Tests &tests);
 
-  void start (TAO_ENV_SINGLE_ARG_DECL)
+  void start (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void method (TAO_ENV_SINGLE_ARG_DECL)
+  void method (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
   int client_propagated (void);
 
@@ -106,7 +106,7 @@ test_i::invocation_lane (CORBA::ULong lane)
 }
 
 void
-test_i::start (TAO_ENV_SINGLE_ARG_DECL)
+test_i::start (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -127,16 +127,16 @@ test_i::start (TAO_ENV_SINGLE_ARG_DECL)
         {
           CORBA::Object_var object =
             this->orb_->resolve_initial_references ("RTCurrent"
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           RTCORBA::Current_var current =
             RTCORBA::Current::_narrow (object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           CORBA::Short current_thread_priority =
-            current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+            current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (current_thread_priority == default_thread_priority)
@@ -145,25 +145,25 @@ test_i::start (TAO_ENV_SINGLE_ARG_DECL)
             test->servant_->invocation_lane (1);
         }
 
-      test->object_->method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test->object_->method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var ior =
         this->orb_->object_to_string (test->object_.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Object_var object =
         this->orb_->string_to_object (ior.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       test_var test_from_string =
         test::_narrow (object.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      test_from_string->method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test_from_string->method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       iterator.advance ();
@@ -204,14 +204,14 @@ test_i::thread_info (const char *method_name)
 }
 
 void
-test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->thread_info ("test_i::method");
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -221,16 +221,16 @@ class Server
 public:
   Server (int argc,
           char *argv[]
-          TAO_ENV_ARG_DECL);
+          ACE_ENV_ARG_DECL);
 
-  void create_servant_in_root_poa (TAO_ENV_SINGLE_ARG_DECL);
-  void create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_DECL);
+  void create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void create_poa_and_servant_with_tp_policy (ACE_ENV_SINGLE_ARG_DECL);
   void create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                                                          RTCORBA::PriorityModel priority_model
-                                                         TAO_ENV_ARG_DECL);
-  void test (TAO_ENV_SINGLE_ARG_DECL);
-  void start_testing (TAO_ENV_SINGLE_ARG_DECL);
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+                                                         ACE_ENV_ARG_DECL);
+  void test (ACE_ENV_SINGLE_ARG_DECL);
+  void start_testing (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
   CORBA::ORB_var orb_;
   RTCORBA::RTORB_var rt_orb_;
@@ -251,7 +251,7 @@ public:
 
 Server::Server (int argc,
                 char *argv[]
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   : stacksize_ (0),
     static_threads_ (1),
     dynamic_threads_ (0),
@@ -264,54 +264,54 @@ Server::Server (int argc,
     CORBA::ORB_init (argc,
                      argv,
                      ""
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTORB"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->rt_orb_ =
     RTCORBA::RTORB::_narrow (object.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   object =
     this->orb_->resolve_initial_references ("RTCurrent"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->current_ =
     RTCORBA::Current::_narrow (object.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   default_thread_priority =
-    this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   object =
     this->orb_->resolve_initial_references ("RootPOA"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->root_poa_ =
     PortableServer::POA::_narrow (object.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->poa_manager_ =
-    this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 
 void
-Server::create_servant_in_root_poa (TAO_ENV_SINGLE_ARG_DECL)
+Server::create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -329,12 +329,12 @@ Server::create_servant_in_root_poa (TAO_ENV_SINGLE_ARG_DECL)
   this->tests_[this->tests_.size () - 1].servant_ =
     servant;
   this->tests_[this->tests_.size () - 1].object_ =
-    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Server::create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_DECL)
+Server::create_poa_and_servant_with_tp_policy (ACE_ENV_SINGLE_ARG_DECL)
 {
   RTCORBA::ThreadpoolId threadpool_id =
     this->rt_orb_->create_threadpool (this->stacksize_,
@@ -344,17 +344,17 @@ Server::create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_DECL)
                                       this->allow_request_buffering_,
                                       this->max_buffered_requests_,
                                       this->max_request_buffer_size_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
     this->rt_orb_->create_threadpool_policy (threadpool_id
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var implicit_activation_policy =
     this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyList policies;
@@ -371,7 +371,7 @@ Server::create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_DECL)
     this->root_poa_->create_POA ("tp_child",
                                  this->poa_manager_.in (),
                                  policies
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant = 0;
@@ -390,14 +390,14 @@ Server::create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_DECL)
   this->tests_[this->tests_.size () - 1].servant_ =
     servant;
   this->tests_[this->tests_.size () - 1].object_ =
-    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                                                           RTCORBA::PriorityModel priority_model
-                                                          TAO_ENV_ARG_DECL)
+                                                          ACE_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolLanes lanes (2);
   lanes.length (2);
@@ -417,18 +417,18 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                                                  this->allow_request_buffering_,
                                                  this->max_buffered_requests_,
                                                  this->max_request_buffer_size_
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
     this->rt_orb_->create_threadpool_policy (threadpool_id
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var priority_model_policy =
     this->rt_orb_->create_priority_model_policy (priority_model,
                                                  default_thread_priority
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyList policies;
@@ -445,12 +445,12 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
     this->root_poa_->create_POA (poa_name,
                                  this->poa_manager_.in (),
                                  policies
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTPortableServer::POA_var rt_poa =
     RTPortableServer::POA::_narrow (poa.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant1 = 0;
@@ -483,13 +483,13 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
       id1 =
         rt_poa->activate_object_with_priority (servant1,
                                                default_thread_priority
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       id2 =
         rt_poa->activate_object_with_priority (servant2,
                                                default_thread_priority + 1
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -501,29 +501,29 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
 
       id1 =
         rt_poa->activate_object (servant1
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       id2 =
         rt_poa->activate_object (servant2
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   CORBA::Object_var object1 =
     poa->id_to_reference (id1.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var object2 =
     poa->id_to_reference (id2.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->tests_.size (this->tests_.size () + 1);
   this->tests_[this->tests_.size () - 1].object_ =
     test::_narrow (object1.in ()
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
   this->tests_[this->tests_.size () - 1].servant_ =
     servant1;
   ACE_CHECK;
@@ -531,14 +531,14 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
   this->tests_.size (this->tests_.size () + 1);
   this->tests_[this->tests_.size () - 1].object_ =
     test::_narrow (object2.in ()
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
   this->tests_[this->tests_.size () - 1].servant_ =
     servant2;
   ACE_CHECK;
 }
 
 void
-Server::start_testing (TAO_ENV_SINGLE_ARG_DECL)
+Server::start_testing (ACE_ENV_SINGLE_ARG_DECL)
 {
   Tests::ITERATOR iterator (this->tests_);
   while (!iterator.done ())
@@ -549,7 +549,7 @@ Server::start_testing (TAO_ENV_SINGLE_ARG_DECL)
       if (test->servant_->client_propagated ())
         {
           CORBA::Short current_thread_priority =
-            this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (current_thread_priority == default_thread_priority)
@@ -558,7 +558,7 @@ Server::start_testing (TAO_ENV_SINGLE_ARG_DECL)
             test->servant_->invocation_lane (1);
         }
 
-      test->object_->start (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test->object_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       iterator.advance ();
@@ -566,29 +566,29 @@ Server::start_testing (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Server::test (TAO_ENV_SINGLE_ARG_DECL)
+Server::test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->start_testing (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->start_testing (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\n*** Changing priority to be higher ***\n\n"));
 
   this->current_->the_priority (default_thread_priority + 1
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->start_testing (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->start_testing (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Server::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Server::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->shutdown (1 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -599,29 +599,29 @@ main (int argc, char *argv[])
     {
       Server server (argc,
                      argv
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.create_servant_in_root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.create_servant_in_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.create_poa_and_servant_with_tp_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_client_propagated_poa",
                                                                RTCORBA::CLIENT_PROPAGATED
-                                                               TAO_ENV_ARG_PARAMETER);
+                                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_server_declared_poa",
                                                                RTCORBA::SERVER_DECLARED
-                                                               TAO_ENV_ARG_PARAMETER);
+                                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
index dcd58ff34b0..10fb0be1150 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
@@ -44,7 +44,7 @@ parse_args (int argc, char *argv[])
 
 RTCORBA::ThreadpoolId
 create_threadpool (RTCORBA::RTORB_ptr rt_orb
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolId id =
     rt_orb->create_threadpool (stacksize,
@@ -54,7 +54,7 @@ create_threadpool (RTCORBA::RTORB_ptr rt_orb
                                allow_request_buffering,
                                max_buffered_requests,
                                max_request_buffer_size
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return id;
@@ -62,7 +62,7 @@ create_threadpool (RTCORBA::RTORB_ptr rt_orb
 
 RTCORBA::ThreadpoolId
 create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolLanes lanes (2);
   lanes.length (2);
@@ -82,7 +82,7 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb
                                           allow_request_buffering,
                                           max_buffered_requests,
                                           max_request_buffer_size
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return id;
@@ -97,31 +97,31 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
         orb->resolve_initial_references ("RTCurrent"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -136,24 +136,24 @@ main (int argc, char *argv[])
         {
           RTCORBA::ThreadpoolId id =
             create_threadpool (rt_orb.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           rt_orb->destroy_threadpool (id
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           id =
             create_threadpool_with_lanes (rt_orb.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           rt_orb->destroy_threadpool (id
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
index 3319ee9fae4..6b770e35e91 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -63,29 +63,29 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
 
       // PolicyCurrent.
       object = orb->resolve_initial_references ("PolicyCurrent"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
         return 1;
 
       // Test object.
-      object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+      object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Test_var server = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+      Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server.in (), "server") == -1)
         return 1;
@@ -108,12 +108,12 @@ main (int argc, char *argv[])
       policy_list.length (1);
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -121,7 +121,7 @@ main (int argc, char *argv[])
 
       CORBA::PolicyList_var pols;
       int status = server->_validate_connection (pols.out ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!status)
@@ -134,7 +134,7 @@ main (int argc, char *argv[])
       // NO new connections should get established.
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Test 2\n"));
-      server->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test 3: Check that <validate_connection> detects policy
@@ -150,16 +150,16 @@ main (int argc, char *argv[])
       protocols[0].protocol_type = TAO_TAG_UIOP_PROFILE;
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       status = server->_validate_connection (pols.out ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status)
@@ -188,14 +188,14 @@ main (int argc, char *argv[])
       protocols[0].protocol_type = TAO_TAG_SHMEM_PROFILE;
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
index d0801d884c2..ba4d598df0d 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
@@ -17,10 +17,10 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -34,7 +34,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */)
+Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -42,10 +42,10 @@ Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAM
 }
 
 void
-Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -96,22 +96,22 @@ create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
                const char *filename
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   // Register with poa.
   PortableServer::ObjectId_var id =
-    poa->activate_object (server_impl TAO_ENV_ARG_PARAMETER);
+    poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
     poa->id_to_reference (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
+    orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -148,17 +148,17 @@ main (int argc, char *argv[])
 
       // RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return 1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servant.
@@ -170,16 +170,16 @@ main (int argc, char *argv[])
                               orb.in (),
                               &server_impl,
                               ior_output_file
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
 
       // Run ORB Event loop.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n"));
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index d60fc0fc5e3..83ff5df4a3a 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -92,12 +92,12 @@ Worker_Thread::svc (void)
   ACE_TRY_NEW_ENV
     {
       this->current_->the_priority (this->priority_
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i < iterations; i++)
         {
-          this->test_->method (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->test_->method (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -123,7 +123,7 @@ main (int argc, char **argv)
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -133,46 +133,46 @@ main (int argc, char **argv)
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
         orb->resolve_initial_references ("RTCurrent"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       current->the_priority (0
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
         orb->resolve_initial_references ("ORBPolicyManager"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
         CORBA::PolicyManager::_narrow (object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
         orb->string_to_object (ior
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_var test =
         test::_narrow (object.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Short_Array priorities;
@@ -191,14 +191,14 @@ main (int argc, char **argv)
                             bands_file,
                             rt_orb.in (),
                             policies
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
       policy_manager->set_policy_overrides (policies,
                                             CORBA::SET_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       u_long i = 0;
@@ -244,7 +244,7 @@ main (int argc, char **argv)
 
       if (shutdown_server)
         {
-          test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/RTCORBA/Linear_Priority/readers.cpp b/TAO/tests/RTCORBA/Linear_Priority/readers.cpp
index c5f1b31b73f..8733eb3a276 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/readers.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/readers.cpp
@@ -10,7 +10,7 @@ get_priority_bands (const char *test_type,
                     const char *bands_file,
                     RTCORBA::RTORB_ptr rt_orb,
                     CORBA::PolicyList &policies
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   //
   // Read bands from a file.
@@ -90,7 +90,7 @@ get_priority_bands (const char *test_type,
 
   CORBA::Policy_var banded_connection_policy =
     rt_orb->create_priority_banded_connection_policy (bands
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   policies.length (policies.length () + 1);
@@ -188,7 +188,7 @@ get_priority_lanes (const char *test_type,
                     CORBA::ULong max_request_buffer_size,
                     CORBA::Boolean allow_borrowing,
                     CORBA::PolicyList &policies
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   Short_Array priorities;
   int result =
@@ -219,12 +219,12 @@ get_priority_lanes (const char *test_type,
                                           allow_request_buffering,
                                           max_buffered_requests,
                                           max_request_buffer_size
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Policy_var threadpool_policy =
     rt_orb->create_threadpool_policy (threadpool_id
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   policies.length (policies.length () + 1);
@@ -245,7 +245,7 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes,
                                    CORBA::ULong max_request_buffer_size,
                                    CORBA::Boolean allow_borrowing,
                                    CORBA::PolicyList &policies
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolLanes lanes;
   lanes.length (number_of_lanes);
@@ -300,19 +300,19 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes,
                                           allow_request_buffering,
                                           max_buffered_requests,
                                           max_request_buffer_size
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
     rt_orb->create_priority_banded_connection_policy (bands
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
     rt_orb->create_threadpool_policy (threadpool_id
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index 38e267f9d49..bdbad4ee4a9 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -14,13 +14,13 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (TAO_ENV_SINGLE_ARG_DECL)
+  void method (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
 
@@ -36,7 +36,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -44,19 +44,19 @@ test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
 
   this->orb_->shutdown (0
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -109,7 +109,7 @@ static void
 write_iors_to_file (CORBA::Object_ptr object,
                     CORBA::ORB_ptr orb,
                     const char *filename
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   FILE *file =
     ACE_OS::fopen (filename, "w");
@@ -117,7 +117,7 @@ write_iors_to_file (CORBA::Object_ptr object,
 
   CORBA::String_var ior =
     orb->object_to_string (object
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   u_int result = 0;
@@ -145,17 +145,17 @@ main (int argc, char **argv)
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -165,16 +165,16 @@ main (int argc, char **argv)
 
       object =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies;
@@ -184,7 +184,7 @@ main (int argc, char **argv)
                             bands_file,
                             rt_orb.in (),
                             policies
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
@@ -201,7 +201,7 @@ main (int argc, char **argv)
                             max_request_buffer_size,
                             allow_borrowing,
                             policies
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
@@ -209,13 +209,13 @@ main (int argc, char **argv)
       CORBA::Policy_var priority_model_policy =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                               0
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Implicit_activation policy.
       CORBA::Policy_var implicit_activation_policy =
         root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies.length (policies.length () + 1);
@@ -230,7 +230,7 @@ main (int argc, char **argv)
         root_poa->create_POA ("child",
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_i *servant = 0;
@@ -243,22 +243,22 @@ main (int argc, char **argv)
       PortableServer::ServantBase_var safe_servant (servant);
 
       test_var test =
-        servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       write_iors_to_file (test.in (),
                           orb.in (),
                           ior
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index e5f063ef5db..29d46e55c91 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -151,7 +151,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -161,11 +161,11 @@ main (int argc, char *argv[])
       // Priority Mapping Manager.
       CORBA::Object_var object =
         orb->resolve_initial_references ("PriorityMappingManager"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::PriorityMappingManager_var mapping_manager =
         RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (mapping_manager.in (), "Mapping Manager") == -1)
         return 1;
@@ -175,19 +175,19 @@ main (int argc, char *argv[])
 
       // RTCurrent.
       object =
-        orb->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (current.in (), "RTCurrent") == -1)
         return 1;
 
       // Obtain Test object reference.
       object =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Test_var server = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+      Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server.in (), "Test object") == -1)
         return 1;
@@ -196,18 +196,18 @@ main (int argc, char *argv[])
       // PriorityModelPolicy.
       CORBA::Policy_var policy =
         server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityModelPolicy_var priority_policy =
-        RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER);
+        RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1)
         return 1;
 
       RTCORBA::PriorityModel priority_model =
-        priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+        priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (priority_model != RTCORBA::CLIENT_PROPAGATED)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -264,9 +264,9 @@ main (int argc, char *argv[])
 
       // Testing over.  Shut down the server.
       ACE_DEBUG ((LM_DEBUG, "Client threads finished\n"));
-      current->the_priority (priority1 TAO_ENV_ARG_PARAMETER);
+      current->the_priority (priority1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -299,10 +299,10 @@ Worker_Thread::svc (void)
     {
       // RTORB.
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 0;
@@ -310,10 +310,10 @@ Worker_Thread::svc (void)
       // PolicyCurrent.
       object =
         this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
@@ -332,12 +332,12 @@ Worker_Thread::svc (void)
       policy_list.length (1);
       policy_list[0] =
         rt_orb->create_client_protocol_policy (protocols
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Wait for other threads.
@@ -346,7 +346,7 @@ Worker_Thread::svc (void)
       for (int i = 0; i < iterations; ++i)
         {
           // Invoke method.
-          this->server_->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index 1c3c0ee9ad2..7326bf6d5fe 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -16,10 +16,10 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -33,17 +33,17 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "test_method invoked\n"));
 }
 
 void
-Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -100,7 +100,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -109,27 +109,27 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
 
       // RootPOA.
       object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return 1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA with CLIENT_PROPAGATED PriorityModelPolicy.
@@ -138,31 +138,31 @@ main (int argc, char *argv[])
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                               0
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
                               poa_policy_list
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create object.
       Test_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        child_poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER);
+        child_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var server =
         child_poa->id_to_reference (id.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print Object IOR.
       CORBA::String_var ior =
-        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ()));
@@ -180,11 +180,11 @@ main (int argc, char *argv[])
         }
 
       // Activate POA manager.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Start ORB event loop.
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
index e8c7cadba07..a401b67193f 100644
--- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
+++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
@@ -31,19 +31,19 @@ test_multiple_orbs (const char *test_name,
             CORBA::ORB_init (argc,
                              argv,
                              name
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (rt_orb)
             {
               CORBA::Object_var object =
                 orbs[i]->resolve_initial_references ("RTORB"
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               rt_orbs[i] =
                 RTCORBA::RTORB::_narrow (object.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_ASSERT (rt_orbs[i].in () != RTCORBA::RTORB::_nil ());
@@ -56,7 +56,7 @@ test_multiple_orbs (const char *test_name,
                i < iterations;
                ++i)
             {
-              orbs[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              orbs[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
index d8de32f08be..9fc50f20a4b 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
@@ -58,7 +58,7 @@ main (int argc, char **argv)
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -68,23 +68,23 @@ main (int argc, char **argv)
 
       CORBA::Object_var object =
         orb->string_to_object (ior
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_var test =
         test::_narrow (object.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i < iterations; i++)
         {
-          test->method (TAO_ENV_SINGLE_ARG_PARAMETER);
+          test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (shutdown_server)
         {
-          test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index f9a2ee4eaa5..8b4269ac9e7 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -12,13 +12,13 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (TAO_ENV_SINGLE_ARG_DECL)
+  void method (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
 
@@ -34,7 +34,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -42,19 +42,19 @@ test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
 
   this->orb_->shutdown (0
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -112,7 +112,7 @@ static void
 write_iors_to_file (CORBA::Object_ptr object,
                     CORBA::ORB_ptr orb,
                     const char *filename
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   FILE *file =
     ACE_OS::fopen (filename, "w");
@@ -120,7 +120,7 @@ write_iors_to_file (CORBA::Object_ptr object,
 
   CORBA::String_var ior =
     orb->object_to_string (object
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (debug)
@@ -144,18 +144,18 @@ void
 create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb,
                                                PortableServer::POA_ptr root_poa,
                                                PortableServer::POAManager_ptr poa_manager
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
 {
   CORBA::PolicyList policies;
 
   CORBA::Policy_var implicit_activation_policy =
     root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var lifespan_policy =
     root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   policies.length (policies.length () + 1);
@@ -170,7 +170,7 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb,
     root_poa->create_POA ("persistent_child",
                           poa_manager,
                           policies
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant = 0;
@@ -183,13 +183,13 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   write_iors_to_file (test.in (),
                       orb,
                       persistent_ior
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -198,7 +198,7 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
                                        RTCORBA::RTORB_ptr rt_orb,
                                        PortableServer::POA_ptr root_poa,
                                        PortableServer::POAManager_ptr poa_manager
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolId threadpool_id =
     rt_orb->create_threadpool (stacksize,
@@ -208,17 +208,17 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
                                allow_request_buffering,
                                max_buffered_requests,
                                max_request_buffer_size
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
     rt_orb->create_threadpool_policy (threadpool_id
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var implicit_activation_policy =
     root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyList policies;
@@ -235,7 +235,7 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
     root_poa->create_POA ("tp_child",
                           poa_manager,
                           policies
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant = 0;
@@ -248,20 +248,20 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   write_iors_to_file (test.in (),
                       orb,
                       transient_ior
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 create_poa_with_tp_and_persistent_policy (RTCORBA::RTORB_ptr rt_orb,
                                           PortableServer::POA_ptr root_poa
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -275,17 +275,17 @@ create_poa_with_tp_and_persistent_policy (RTCORBA::RTORB_ptr rt_orb,
                                    allow_request_buffering,
                                    max_buffered_requests,
                                    max_request_buffer_size
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Policy_var threadpool_policy =
         rt_orb->create_threadpool_policy (threadpool_id
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Policy_var lifespan_policy =
         root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       policies.length (policies.length () + 1);
@@ -300,7 +300,7 @@ create_poa_with_tp_and_persistent_policy (RTCORBA::RTORB_ptr rt_orb,
         root_poa->create_POA ("invalid",
                               PortableServer::POAManager::_nil (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This next line of code should not run because an exception
@@ -332,7 +332,7 @@ main (int argc, char **argv)
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -342,67 +342,67 @@ main (int argc, char **argv)
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
         orb->resolve_initial_references ("RTCurrent"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       create_poa_and_servant_with_tp_policy (orb.in (),
                                              rt_orb.in (),
                                              root_poa.in  (),
                                              poa_manager.in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       create_poa_and_servant_with_persistent_policy (orb.in (),
                                                      root_poa.in  (),
                                                      poa_manager.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       create_poa_with_tp_and_persistent_policy (rt_orb.in (),
                                                 root_poa.in  ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index 23c6fd3679d..665b75c0b4e 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -65,7 +65,7 @@ main (int argc, char **argv)
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -94,52 +94,52 @@ main (int argc, char **argv)
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTCurrent"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
         orb->string_to_object (ior
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_var test =
         test::_narrow (object.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i < iterations; i++)
         {
           current->the_priority (default_thread_priority
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Short priority =
-            test->method (TAO_ENV_SINGLE_ARG_PARAMETER);
+            test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (priority != TAO_INVALID_PRIORITY)
             {
               current->the_priority (priority
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              test->prioritized_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+              test->prioritized_method (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
 
       if (shutdown_server)
         {
-          test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index 15504b7afaf..52122ce985c 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -16,16 +16,16 @@ public:
           CORBA::Short server_priority,
           CORBA::Short client_priority);
 
-  CORBA::Short method (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Short method (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void prioritized_method (TAO_ENV_SINGLE_ARG_DECL)
+  void prioritized_method (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
 
@@ -47,7 +47,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 CORBA::Short
-test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -57,21 +57,21 @@ test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-test_i::prioritized_method (TAO_ENV_SINGLE_ARG_DECL)
+test_i::prioritized_method (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTCurrent"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTCORBA::Current_var current =
     RTCORBA::Current::_narrow (object.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Short priority =
-    current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+    current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -84,19 +84,19 @@ test_i::prioritized_method (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
 
   this->orb_->shutdown (0
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -147,7 +147,7 @@ static void
 write_iors_to_file (CORBA::Object_ptr object,
                     CORBA::ORB_ptr orb,
                     const char *filename
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   FILE *file =
     ACE_OS::fopen (filename, "w");
@@ -155,7 +155,7 @@ write_iors_to_file (CORBA::Object_ptr object,
 
   CORBA::String_var ior =
     orb->object_to_string (object
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   u_int result = 0;
@@ -178,87 +178,87 @@ public:
           PortableServer::POA_ptr root_poa,
           PortableServer::POAManager_ptr poa_manager);
 
-  void test_root_poa (TAO_ENV_SINGLE_ARG_DECL);
-  void test_child_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_root_poa (ACE_ENV_SINGLE_ARG_DECL);
+  void test_child_poa (ACE_ENV_SINGLE_ARG_DECL);
 
   typedef void (server::*test_function) (CORBA::PolicyList &policies,
                                          CORBA::Short server_priority,
                                          CORBA::Short client_priority,
                                          const char *test_name
-                                         TAO_ENV_ARG_DECL);
+                                         ACE_ENV_ARG_DECL);
 
   void test_default_pool_poa (CORBA::Short server_priority,
                               CORBA::Short client_priority,
                               server::test_function function,
                               const char *test_name
-                              TAO_ENV_ARG_DECL);
+                              ACE_ENV_ARG_DECL);
 
   void test_bands_poa (CORBA::PolicyList &policies,
                        CORBA::Short server_priority,
                        CORBA::Short client_priority,
                        server::test_function function,
                        const char *test_name
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
 
   void test_no_lanes_poa (CORBA::Short server_priority,
                           CORBA::Short client_priority,
                           server::test_function function,
                           const char *test_name
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
 
   void test_lanes_poa (CORBA::Short server_priority,
                        CORBA::Short client_priority,
                        server::test_function function,
                        const char *test_name
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
 
   void test_no_bands_client_propagated_poa (CORBA::PolicyList &policies,
                                             CORBA::Short server_priority,
                                             CORBA::Short client_priority,
                                             const char *test_name
-                                            TAO_ENV_ARG_DECL);
+                                            ACE_ENV_ARG_DECL);
 
   void test_bands_client_propagated_poa (CORBA::PolicyList &policies,
                                          CORBA::Short server_priority,
                                          CORBA::Short client_priority,
                                          const char *test_name
-                                         TAO_ENV_ARG_DECL);
+                                         ACE_ENV_ARG_DECL);
 
   void test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
                                           CORBA::Short server_priority,
                                           CORBA::Short client_priority,
                                           const char *test_name
-                                          TAO_ENV_ARG_DECL);
+                                          ACE_ENV_ARG_DECL);
 
   void test_bands_server_declared_poa (CORBA::PolicyList &policies,
                                        CORBA::Short server_priority,
                                        CORBA::Short client_priority,
                                        const char *test_name
-                                       TAO_ENV_ARG_DECL);
+                                       ACE_ENV_ARG_DECL);
 
-  void test_default_pool_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_default_pool_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL);
 
-  void test_no_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_no_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL);
 
-  void test_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL);
 
-  void test_default_pool_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_default_pool_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL);
 
-  void test_no_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_no_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL);
 
-  void test_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL);
 
-  void test_default_pool_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_default_pool_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL);
 
-  void test_no_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_no_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL);
 
-  void test_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL);
 
-  void test_default_pool_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_default_pool_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL);
 
-  void test_no_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_no_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL);
 
-  void test_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
 
@@ -280,7 +280,7 @@ server::server (CORBA::ORB_ptr orb,
 }
 
 void
-server::test_root_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_root_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -294,31 +294,31 @@ server::test_root_poa (TAO_ENV_SINGLE_ARG_DECL)
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   write_iors_to_file (test.in (),
                       this->orb_.in (),
                       "root"
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_child_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_child_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::PolicyList policies;
   policies.length (1);
   policies[policies.length () - 1] =
     this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var poa =
     this->root_poa_->create_POA ("child",
                                  this->poa_manager_.in (),
                                  policies
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant = 0;
@@ -333,13 +333,13 @@ server::test_child_poa (TAO_ENV_SINGLE_ARG_DECL)
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   write_iors_to_file (test.in (),
                       this->orb_.in (),
                       "child"
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -348,14 +348,14 @@ server::test_default_pool_poa (CORBA::Short server_priority,
                                CORBA::Short client_priority,
                                server::test_function function,
                                const char *test_name
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   CORBA::PolicyList empty_policies;
   (this->*function) (empty_policies,
                      server_priority,
                      client_priority,
                      test_name
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -365,7 +365,7 @@ server::test_bands_poa (CORBA::PolicyList &policies,
                         CORBA::Short client_priority,
                         server::test_function function,
                         const char *test_name
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   RTCORBA::PriorityBands bands;
   bands.length (3);
@@ -380,14 +380,14 @@ server::test_bands_poa (CORBA::PolicyList &policies,
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
     this->rt_orb_->create_priority_banded_connection_policy (bands
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   (this->*function) (policies,
                      server_priority,
                      client_priority,
                      test_name
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -396,7 +396,7 @@ server::test_no_lanes_poa (CORBA::Short server_priority,
                            CORBA::Short client_priority,
                            server::test_function function,
                            const char *test_name
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolId threadpool_id =
     this->rt_orb_->create_threadpool (stacksize,
@@ -406,12 +406,12 @@ server::test_no_lanes_poa (CORBA::Short server_priority,
                                       allow_request_buffering,
                                       max_buffered_requests,
                                       max_request_buffer_size
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
     this->rt_orb_->create_threadpool_policy (threadpool_id
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyList policies;
@@ -423,7 +423,7 @@ server::test_no_lanes_poa (CORBA::Short server_priority,
                      server_priority,
                      client_priority,
                      test_name
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -432,7 +432,7 @@ server::test_lanes_poa (CORBA::Short server_priority,
                         CORBA::Short client_priority,
                         server::test_function function,
                         const char *test_name
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolLanes lanes;
   lanes.length (3);
@@ -456,12 +456,12 @@ server::test_lanes_poa (CORBA::Short server_priority,
                                                  allow_request_buffering,
                                                  max_buffered_requests,
                                                  max_request_buffer_size
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
     this->rt_orb_->create_threadpool_policy (threadpool_id
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyList policies;
@@ -473,7 +473,7 @@ server::test_lanes_poa (CORBA::Short server_priority,
                      server_priority,
                      client_priority,
                      test_name
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -482,25 +482,25 @@ server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies,
                                              CORBA::Short server_priority,
                                              CORBA::Short client_priority,
                                              const char *test_name
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
 {
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
     this->rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                                  default_thread_priority
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var poa =
     this->root_poa_->create_POA (test_name,
                                  this->poa_manager_.in (),
                                  policies
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTPortableServer::POA_var rt_poa =
     RTPortableServer::POA::_narrow (poa.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant = 0;
@@ -516,18 +516,18 @@ server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies,
 
   PortableServer::ObjectId_var id =
     rt_poa->activate_object (servant
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var object =
     poa->id_to_reference (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   write_iors_to_file (object.in (),
                       this->orb_.in (),
                       test_name
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -536,80 +536,80 @@ server::test_bands_client_propagated_poa (CORBA::PolicyList &policies,
                                           CORBA::Short server_priority,
                                           CORBA::Short client_priority,
                                           const char *test_name
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   this->test_bands_poa (policies,
                         server_priority,
                         client_priority,
                         &server::test_no_bands_client_propagated_poa,
                         test_name
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_default_pool_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_default_pool_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->test_default_pool_poa (::client_priority + 1,
                                ::client_priority + 1,
                                &server::test_no_bands_client_propagated_poa,
                                "default_pool_no_bands_client_propagated"
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_no_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_no_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->test_no_lanes_poa (::client_priority - 1,
                            ::client_priority - 1,
                            &server::test_no_bands_client_propagated_poa,
                            "no_lanes_no_bands_client_propagated"
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->test_lanes_poa (::client_priority,
                         ::client_priority,
                         &server::test_no_bands_client_propagated_poa,
                         "lanes_no_bands_client_propagated"
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_default_pool_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_default_pool_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->test_default_pool_poa (::client_priority + 1,
                                ::client_priority + 1,
                                &server::test_bands_client_propagated_poa,
                                "default_pool_bands_client_propagated"
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_no_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_no_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->test_no_lanes_poa (::client_priority - 1,
                            ::client_priority - 1,
                            &server::test_bands_client_propagated_poa,
                            "no_lanes_bands_client_propagated"
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->test_lanes_poa (::client_priority,
                         ::client_priority + 1,
                         &server::test_bands_client_propagated_poa,
                         "lanes_bands_client_propagated"
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
@@ -619,25 +619,25 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
                                            CORBA::Short server_priority,
                                            CORBA::Short client_priority,
                                            const char *test_name
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
 {
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
     this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
                                                  default_thread_priority
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var poa =
     this->root_poa_->create_POA (test_name,
                                  this->poa_manager_.in (),
                                  policies
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTPortableServer::POA_var rt_poa =
     RTPortableServer::POA::_narrow (poa.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant = 0;
@@ -654,18 +654,18 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
   PortableServer::ObjectId_var id =
     rt_poa->activate_object_with_priority (servant,
                                            ::server_priority
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var object =
     poa->id_to_reference (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   write_iors_to_file (object.in (),
                       this->orb_.in (),
                       test_name
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -674,80 +674,80 @@ server::test_bands_server_declared_poa (CORBA::PolicyList &policies,
                                         CORBA::Short server_priority,
                                         CORBA::Short client_priority,
                                         const char *test_name
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   this->test_bands_poa (policies,
                         server_priority,
                         client_priority,
                         &server::test_no_bands_server_declared_poa,
                         test_name
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_default_pool_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_default_pool_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->test_default_pool_poa (::server_priority,
                                ::client_priority + 1,
                                &server::test_no_bands_server_declared_poa,
                                "default_pool_no_bands_server_declared"
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_no_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_no_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->test_no_lanes_poa (::server_priority,
                            ::client_priority - 1,
                            &server::test_no_bands_server_declared_poa,
                            "no_lanes_no_bands_server_declared"
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->test_lanes_poa (::server_priority,
                         ::client_priority + 1,
                         &server::test_no_bands_server_declared_poa,
                         "lanes_no_bands_server_declared"
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_default_pool_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_default_pool_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->test_default_pool_poa (::server_priority,
                                ::client_priority - 1,
                                &server::test_bands_server_declared_poa,
                                "default_pool_bands_server_declared"
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_no_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_no_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->test_no_lanes_poa (::server_priority,
                            ::client_priority + 1,
                            &server::test_bands_server_declared_poa,
                            "no_lanes_bands_server_declared"
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL)
+server::test_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->test_lanes_poa (::server_priority,
                         ::client_priority - 1,
                         &server::test_bands_server_declared_poa,
                         "lanes_bands_server_declared"
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -764,17 +764,17 @@ main (int argc, char **argv)
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The following sets the current thread to the lowest priority
@@ -798,16 +798,16 @@ main (int argc, char **argv)
 
       object =
         orb->resolve_initial_references ("RTCurrent"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       client_priority =
@@ -823,16 +823,16 @@ main (int argc, char **argv)
 
       object =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server server (orb.in (),
@@ -840,55 +840,55 @@ main (int argc, char **argv)
                      root_poa.in (),
                      poa_manager.in ());
 
-      server.test_root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_child_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_child_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_default_pool_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_default_pool_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_default_pool_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_default_pool_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_no_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_no_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_no_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_no_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_lanes_no_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_lanes_no_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_default_pool_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_default_pool_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_default_pool_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_default_pool_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_no_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_no_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_no_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_no_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_lanes_bands_client_propagated_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server.test_lanes_bands_server_declared_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp
index 940062c0f5b..0815c6c4973 100644
--- a/TAO/tests/RTCORBA/Private_Connection/client.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -66,37 +66,37 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
 
       // PolicyCurrent.
       object = orb->resolve_initial_references ("PolicyCurrent"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
         return 1;
 
       // Test object 1.
-      object = orb->string_to_object (ior1 TAO_ENV_ARG_PARAMETER);
+      object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Test_var server1 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+      Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server1.in (), "server1") == -1)
         return 1;
 
       // Test object 2.
-      object = orb->string_to_object (ior2 TAO_ENV_ARG_PARAMETER);
+      object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Test_var server2 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+      Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server2.in (), "server2") == -1)
         return 1;
@@ -106,34 +106,34 @@ main (int argc, char *argv[])
       // following three.
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 1 --> new connection\n"));
-      server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 2 --> use connection from invocation 1\n"));
-      server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 3 --> use connection from invocation 1\n"));
-      server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 4 --> use connection from invocation 1\n"));
-      server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set RTCORBA::PrivateConnectionPolicy on PolicyCurrent.
       CORBA::PolicyList policy_list;
       policy_list.length (1);
       policy_list[0] =
-        rt_orb->create_private_connection_policy (TAO_ENV_SINGLE_ARG_PARAMETER);
+        rt_orb->create_private_connection_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
 
       // Make four invocations on test objects again.  This time,
       // since RTCORBA::PrivateConnectionPolicy is set, we expect a
@@ -143,28 +143,28 @@ main (int argc, char *argv[])
       // third, and <server2>'s reused on fourth.
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 5 --> new connection\n"));
-      server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 6 --> new connection\n"));
-      server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 7 --> use connection from invocation 5\n"));
-      server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server1->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 8 --> use connection from invocation 6\n"));
-      server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server2->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Testing over.  Shut down Server ORB.
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Testing over - shutting down\n"));
-      server1->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp
index 69de99f823e..792bd559cbf 100644
--- a/TAO/tests/RTCORBA/Private_Connection/server.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp
@@ -15,10 +15,10 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -32,7 +32,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */)
+Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -40,10 +40,10 @@ Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAM
 }
 
 void
-Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -100,22 +100,22 @@ create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
                const char *filename
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   // Register with poa.
   PortableServer::ObjectId_var id =
-    poa->activate_object (server_impl TAO_ENV_ARG_PARAMETER);
+    poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
     poa->id_to_reference (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
+    orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
@@ -143,7 +143,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -152,17 +152,17 @@ main (int argc, char *argv[])
 
       // RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return 1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servants.
@@ -175,7 +175,7 @@ main (int argc, char *argv[])
                               orb.in (),
                               &server_impl1,
                               ior_output_file1
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
@@ -184,16 +184,16 @@ main (int argc, char *argv[])
                               orb.in (),
                               &server_impl2,
                               ior_output_file2
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
 
       // Run ORB Event loop.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n"));
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index b5db53f4614..70c129f16ad 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -66,22 +66,22 @@ test_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
     {
       RTCORBA::Mutex_var my_mutex;
 
-      my_mutex = rt_orb->create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER);
+      my_mutex = rt_orb->create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      my_mutex->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+      my_mutex->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      my_mutex->unlock (TAO_ENV_SINGLE_ARG_PARAMETER);
+      my_mutex->unlock (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      my_mutex->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+      my_mutex->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      my_mutex->unlock (TAO_ENV_SINGLE_ARG_PARAMETER);
+      my_mutex->unlock (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      rt_orb->destroy_mutex (my_mutex.in () TAO_ENV_ARG_PARAMETER);
+      rt_orb->destroy_mutex (my_mutex.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -109,7 +109,7 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
       CORBA::Boolean created_flag;
 
       larry_mutex1 = rt_orb->create_named_mutex ("larry",
-                                                 created_flag TAO_ENV_ARG_PARAMETER);
+                                                 created_flag ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (created_flag != 1)
@@ -119,7 +119,7 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
 
       moe_mutex1 = rt_orb->create_named_mutex ("moe",
                                                created_flag
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (created_flag != 1)
@@ -127,10 +127,10 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
                            "ERROR: Expected named mutex moe to be created, but it wasn't\n"),
                           1);
 
-      larry_mutex1->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+      larry_mutex1->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      larry_mutex1->unlock (TAO_ENV_SINGLE_ARG_PARAMETER);
+      larry_mutex1->unlock (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test creating the mutex a second time
@@ -138,7 +138,7 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
         RTCORBA::Mutex_var larry_mutex2;
         larry_mutex2 = rt_orb->create_named_mutex ("larry",
                                                    created_flag
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (created_flag != 0)
@@ -153,10 +153,10 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
                              "ERROR: Should have gotten the same mutex, but didn't\n"),
                             1);
 
-        larry_mutex2->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+        larry_mutex2->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        larry_mutex2->unlock (TAO_ENV_SINGLE_ARG_PARAMETER);
+        larry_mutex2->unlock (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -164,7 +164,7 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
       {
         RTCORBA::Mutex_var larry_mutex3;
         larry_mutex3 = rt_orb->open_named_mutex ("larry"
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // test the pointers...
@@ -174,24 +174,24 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
                              "ERROR: Should have gotten the same mutex, but didn't\n"),
                             1);
 
-        larry_mutex3->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+        larry_mutex3->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        larry_mutex3->unlock (TAO_ENV_SINGLE_ARG_PARAMETER);
+        larry_mutex3->unlock (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
       // Make sure that nothing has been broken behind the scenes.
-      larry_mutex1->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+      larry_mutex1->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      larry_mutex1->unlock (TAO_ENV_SINGLE_ARG_PARAMETER);
+      larry_mutex1->unlock (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      rt_orb->destroy_mutex (larry_mutex1.in () TAO_ENV_ARG_PARAMETER);
+      rt_orb->destroy_mutex (larry_mutex1.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      rt_orb->destroy_mutex (moe_mutex1.in () TAO_ENV_ARG_PARAMETER);
+      rt_orb->destroy_mutex (moe_mutex1.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -216,7 +216,7 @@ test_named_mutex_exception (RTCORBA::RTORB_ptr rt_orb)
     {
       RTCORBA::Mutex_var larry_mutex1;
 
-      larry_mutex1 = rt_orb->open_named_mutex ("larry" TAO_ENV_ARG_PARAMETER);
+      larry_mutex1 = rt_orb->open_named_mutex ("larry" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -340,7 +340,7 @@ test_mutex_threads (RTCORBA::RTORB_ptr rt_orb)
 
   ACE_TRY_NEW_ENV
     {
-      RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER);
+      RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_data.mutex = mutex;
@@ -385,7 +385,7 @@ mutex_test_try_lock_thread (void *args)
     {
       // check that try_lock (0) returns false
       ACE_DEBUG ((LM_DEBUG,"attempting try_lock (0) - expect failure (but no exceptions) \n"));
-      result = mutex->try_lock (0u TAO_ENV_ARG_PARAMETER);
+      result = mutex->try_lock (0u ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result)
@@ -405,7 +405,7 @@ mutex_test_try_lock_thread (void *args)
                       "attempting try_lock (5 sec) - expect failure after 5 secs (but no exceptions)\n"));
 
           timer.start ();
-          result = mutex->try_lock (50000000u /*5sec*/ TAO_ENV_ARG_PARAMETER);
+          result = mutex->try_lock (50000000u /*5sec*/ ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           timer.stop ();
 
@@ -456,12 +456,12 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb)
 
   ACE_TRY_NEW_ENV
     {
-      RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER);
+      RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test out try_lock and keep the lock so that the spawned task
       // can test out try_lock failure cases
-      result = mutex->try_lock (0u TAO_ENV_ARG_PARAMETER);
+      result = mutex->try_lock (0u ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (!result)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -506,7 +506,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       // ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -515,10 +515,10 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp
index 4acef208296..3d5583a0f41 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp
@@ -51,22 +51,22 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 
 CORBA::Short
 check_policy (Test_ptr server
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   CORBA::Policy_var policy =
     server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   RTCORBA::PriorityModelPolicy_var priority_policy =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER);
+    RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1)
     return -1;
 
   RTCORBA::PriorityModel priority_model =
-    priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+    priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (priority_model != RTCORBA::SERVER_DECLARED)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -74,7 +74,7 @@ check_policy (Test_ptr server
                        "RTCORBA::SERVER_DECLARED!\n"),
                       -1);
 
-  return priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
@@ -90,7 +90,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -99,19 +99,19 @@ main (int argc, char *argv[])
 
           // Test object 1.
       CORBA::Object_var object =
-        orb->string_to_object (ior1 TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Test_var server1 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+      Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server1.in (), "server1") == -1)
         return 1;
 
       // Test object 2.
-      object = orb->string_to_object (ior2 TAO_ENV_ARG_PARAMETER);
+      object = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-          Test_var server2 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+          Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server2.in (), "server2") == -1)
         return 1;
@@ -121,7 +121,7 @@ main (int argc, char *argv[])
 
       // Test object 1.
       CORBA::Short server1_priority =
-        check_policy (server1.in () TAO_ENV_ARG_PARAMETER);
+        check_policy (server1.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
           if (server1_priority == -1)
@@ -129,7 +129,7 @@ main (int argc, char *argv[])
 
           // Test object 2.
       CORBA::Short server2_priority =
-        check_policy (server2.in () TAO_ENV_ARG_PARAMETER);
+        check_policy (server2.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (server2_priority == -1)
         return 1;
@@ -137,16 +137,16 @@ main (int argc, char *argv[])
           // Testing: make several invocations on test objects.
       for (int i = 0; i < 5; ++i)
         {
-          server1->test_method (server1_priority TAO_ENV_ARG_PARAMETER);
+          server1->test_method (server1_priority ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          server2->test_method (server2_priority TAO_ENV_ARG_PARAMETER);
+          server2->test_method (server2_priority ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           }
 
       // Testing over. Shut down Server ORB.
-      server1->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index ffccc07a31f..4091d002eb5 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -16,10 +16,10 @@ public:
   // ctor
 
   void test_method (CORBA::Short priority
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -34,25 +34,25 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 void
 Test_i::test_method (CORBA::Short priority
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Use RTCurrent to find out the CORBA priority of the current
   // thread.
 
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+    RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (obj.in ()))
     ACE_THROW (CORBA::INTERNAL ());
 
   CORBA::Short servant_thread_priority =
-    current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+    current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Print out the info.
@@ -68,10 +68,10 @@ Test_i::test_method (CORBA::Short priority
 }
 
 void
-Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -160,7 +160,7 @@ create_object (RTPortableServer::POA_ptr poa,
                Test_i *server_impl,
                CORBA::Short priority,
                const char *filename
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   // Register with poa.
   PortableServer::ObjectId_var id;
@@ -168,20 +168,20 @@ create_object (RTPortableServer::POA_ptr poa,
   if (priority > -1)
     id = poa->activate_object_with_priority (server_impl,
                                              priority
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   else
-    id = poa->activate_object (server_impl TAO_ENV_ARG_PARAMETER);
+    id = poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
     poa->id_to_reference (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
+    orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
@@ -213,7 +213,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -222,27 +222,27 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
 
       // RootPOA.
       object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return 1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create child POA with SERVER_DECLARED PriorityModelPolicy,
@@ -253,23 +253,23 @@ main (int argc, char *argv[])
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
                                               poa_priority
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       poa_policy_list[1] =
         root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
                               poa_policy_list
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTPortableServer::POA_var rt_poa =
-        RTPortableServer::POA::_narrow (child_poa.in () TAO_ENV_ARG_PARAMETER);
+        RTPortableServer::POA::_narrow (child_poa.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_poa.in (), "RTPOA") == -1)
         return 1;
@@ -282,7 +282,7 @@ main (int argc, char *argv[])
       int result;
       ACE_DEBUG ((LM_DEBUG, "\nActivated object one as "));
       result = create_object (rt_poa.in (), orb.in (), &server_impl,
-                              -1, ior_output_file1 TAO_ENV_ARG_PARAMETER);
+                              -1, ior_output_file1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
@@ -290,17 +290,17 @@ main (int argc, char *argv[])
       // Create object 2 (override POA's priority).
       ACE_DEBUG ((LM_DEBUG, "\nActivated object two as "));
       result = create_object (rt_poa.in (), orb.in (), &server_impl,
-                              object_priority, ior_output_file2 TAO_ENV_ARG_PARAMETER);
+                              object_priority, ior_output_file2 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
 
       // Activate POA manager.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Start ORB event loop.
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
index c9e04b9131f..2d8a3340175 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
@@ -39,18 +39,18 @@ main (int argc, char *argv[])
     {
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server =
-        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -62,7 +62,7 @@ main (int argc, char *argv[])
         }
 
       // Make an invocation on the obtained Test object.
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index a5ab9ea5636..99c8f19d00d 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -16,7 +16,7 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -30,12 +30,12 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Received request to shut down the ORB\n"));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -85,7 +85,7 @@ parse_args (int argc, char *argv[])
 
 int
 check_default_server_protocol (CORBA::ORB_ptr orb
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   // Users should never write code like below.
   // It is for testing purposes only! (Unfortunately, there
@@ -95,7 +95,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb
 
   RTCORBA::ServerProtocolPolicy_var policy =
     RTCORBA::ServerProtocolPolicy::_narrow (server_protocol.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (policy.in ()))
@@ -104,7 +104,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb
                        "is missing\n"),
                       -1);
 
-  RTCORBA::ProtocolList_var protocols = policy->protocols (TAO_ENV_SINGLE_ARG_PARAMETER);
+  RTCORBA::ProtocolList_var protocols = policy->protocols (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -126,7 +126,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb
           RTCORBA::TCPProtocolProperties_var tcp_properties =
             RTCORBA::TCPProtocolProperties::_narrow (properties.in
                                                      ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           if (!CORBA::is_nil (tcp_properties.in ()))
@@ -144,7 +144,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb
           RTCORBA::UnixDomainProtocolProperties_var uiop_properties =
             RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in
                                                             ()
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
 
@@ -169,18 +169,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -189,18 +189,18 @@ main (int argc, char *argv[])
                           -1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      object = orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
+      object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check ORB default ServerProtocol configuration.
       int result = check_default_server_protocol (orb.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return 1;
@@ -222,7 +222,7 @@ main (int argc, char *argv[])
       poa_policy_list.length (1);
       poa_policy_list[0] =
         rt_orb->create_server_protocol_policy (protocols
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa;
@@ -233,7 +233,7 @@ main (int argc, char *argv[])
             root_poa->create_POA ("Child_POA",
                                   poa_manager.in (),
                                   poa_policy_list
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -246,17 +246,17 @@ main (int argc, char *argv[])
       Test_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER);
+        poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var server =
         poa->id_to_reference (id.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print Object IOR.
       CORBA::String_var ior =
-        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "\nActivated as <%s>\n\n", ior.in ()));
@@ -274,10 +274,10 @@ main (int argc, char *argv[])
         }
 
       // Run ORB Event loop.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index 2415f06176f..c2623195e68 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -58,7 +58,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -67,11 +67,11 @@ main (int argc, char *argv[])
       return result;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_var test =
-        test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       pid_t pid =
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
           CORBA::Long r =
             test->method (pid,
                           i
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ASSERT (r == i);
@@ -92,7 +92,7 @@ main (int argc, char *argv[])
 
       if (shutdown_server)
         {
-          test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index 192350c0c60..63b1ea466d3 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -58,11 +58,11 @@ parse_args (int argc, char *argv[])
 int
 write_ior_to_file (CORBA::ORB_ptr orb,
                    test_ptr test
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   CORBA::String_var ior =
     orb->object_to_string (test
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   char filename[BUFSIZ];
@@ -97,7 +97,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
                                  PortableServer::POA_ptr root_poa,
                                  CORBA::ORB_ptr orb,
                                  RTCORBA::RTORB_ptr rt_orb
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   // Policies for the firstPOA to be created.
   CORBA::PolicyList policies (3); policies.length (3);
@@ -106,7 +106,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   policies[0] =
     root_poa->create_implicit_activation_policy
       (PortableServer::IMPLICIT_ACTIVATION
-       TAO_ENV_ARG_PARAMETER);
+       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Thread pool policy.
@@ -117,7 +117,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   policies[2] =
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                           0
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create the POA under the RootPOA.
@@ -125,7 +125,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
     root_poa->create_POA (poa_name,
                           poa_manager,
                           policies
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Creation of POAs is over. Destroy the Policy objects.
@@ -133,7 +133,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
        i < policies.length ();
        ++i)
     {
-      policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -146,13 +146,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   ACE_UNUSED_ARG (safe_servant);
 
   test_var test =
-    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   int result =
     write_ior_to_file (orb,
                        test.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
@@ -171,45 +171,45 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
         orb->resolve_initial_references ("RTORB"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
         RTCORBA::RTORB::_narrow (object.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
         orb->resolve_initial_references ("RTCurrent"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (object.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Priority default_thread_priority =
-        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -221,19 +221,19 @@ main (int argc, char *argv[])
                       root_poa.in (),
                       nap_time);
       test_var test =
-        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       result =
         write_ior_to_file (orb.in (),
                            test.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong stacksize = 0;
@@ -249,12 +249,12 @@ main (int argc, char *argv[])
                                    allow_request_buffering,
                                    max_buffered_requests,
                                    max_request_buffer_size
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Policy_var threadpool_policy_1 =
         rt_orb->create_threadpool_policy (threadpool_id_1
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Boolean allow_borrowing = 0;
@@ -276,12 +276,12 @@ main (int argc, char *argv[])
                                               allow_request_buffering,
                                               max_buffered_requests,
                                               max_request_buffer_size
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Policy_var threadpool_policy_2 =
         rt_orb->create_threadpool_policy (threadpool_id_2
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       result =
@@ -291,7 +291,7 @@ main (int argc, char *argv[])
                                          root_poa.in (),
                                          orb.in (),
                                          rt_orb.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
@@ -303,15 +303,15 @@ main (int argc, char *argv[])
                                          root_poa.in (),
                                          orb.in (),
                                          rt_orb.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
index 03c8b5b52b4..d3079c4283e 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
@@ -19,7 +19,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 CORBA::Long
 test_i::method (CORBA::Long client_id,
                 CORBA::Long iteration
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ORB_Core's TSS resources.
@@ -49,16 +49,16 @@ test_i::method (CORBA::Long client_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
index 5fed9fa6379..d3c8bf5af4e 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
@@ -23,15 +23,15 @@ public:
   /// Test method.
   CORBA::Long method (CORBA::Long client_id,
                       CORBA::Long iteration
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the server.
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// ORB.